From cb806b16999933624930444d32132812ae7bee73 Mon Sep 17 00:00:00 2001 From: Jeff Byrnes Date: Wed, 3 Apr 2019 11:17:12 -0400 Subject: [PATCH 1/2] Set docker_compose_dir like other inventory vars When docker-compose become the sole method for using Docker directly, some of this was shifted around in ways that are inconsistent with other elements. This adjusts it so that: * The inventory variable default is set like the others, and is less confusing * We no longer mention the Standalone Docker in inventory * We format our INSTALL docs w/r/t this var --- INSTALL.md | 2 +- installer/inventory | 3 +-- installer/roles/local_docker/defaults/main.yml | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 78d2cf8164..95839530e7 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -446,7 +446,7 @@ Before starting the build process, review the [inventory](./installer/inventory) *docker_compose_dir* -When using docker-compose, the `docker-compose.yml` file will be created there (default `/tmp/awxcompose`). +> When using docker-compose, the `docker-compose.yml` file will be created there (default `/tmp/awxcompose`). *ca_trust_dir* diff --git a/installer/inventory b/installer/inventory index 16b6c088d6..e470012cf6 100644 --- a/installer/inventory +++ b/installer/inventory @@ -54,11 +54,10 @@ awx_web_hostname=awxweb postgres_data_dir=/tmp/pgdocker host_port=80 #ssl_certificate= +docker_compose_dir=/tmp/awxcompose # Required for Openshift when building the image on your own # Optional for Openshift if using Dockerhub or another prebuilt registry -# Required for Standalone Docker Install if building the image on your own -# Optional for Standalone Docker Install if using Dockerhub or another prebuilt registry # Required for Docker Compose Install if building the image on your own # Optional for Docker Compose Install if using Dockerhub or another prebuilt registry # Define if you want the image pushed to a registry. The container definition will also use these images diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index 903de06c73..35d61eba21 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -11,5 +11,3 @@ rabbitmq_password: "guest" postgresql_version: "9.6" postgresql_image: "postgres:{{postgresql_version}}" - -docker_compose_dir: "/tmp/awxcompose" From e0861fee3a3cb34096a0764541e7200563c16cb3 Mon Sep 17 00:00:00 2001 From: Jeff Byrnes Date: Wed, 3 Apr 2019 11:22:51 -0400 Subject: [PATCH 2/2] Update INSTALL docs re: docker-compose prereqs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As it turns out, the docker-compose Python module is required, and docker-py doesn’t cut it. Even more confusing, docker-compose Python module installs the docker Python module, which conflicts with docker-py. To avoid this, there are additional docs to call this out. --- INSTALL.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 95839530e7..65cda0954e 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -59,7 +59,9 @@ Before you can run a deployment, you'll need the following installed in your loc - [Ansible](http://docs.ansible.com/ansible/latest/intro_installation.html) Requires Version 2.4+ - [Docker](https://docs.docker.com/engine/installation/) -- [docker-py](https://github.com/docker/docker-py) Python module +- [docker](https://pypi.org/project/docker/) Python module + + This is incompatible with `docker-py`. If you have previously installed `docker-py`, please uninstall it. + + We use this module instead of `docker-py` because it is what the `docker-compose` Python module requires. - [GNU Make](https://www.gnu.org/software/make/) - [Git](https://git-scm.com/) Requires Version 1.8.4+ - [Node 8.x LTS version](https://nodejs.org/en/download/) @@ -396,7 +398,8 @@ Unlike Openshift's `Route` the Kubernetes `Ingress` doesn't yet handle SSL termi ### Prerequisites - [Docker](https://docs.docker.com/engine/installation/) on the host where AWX will be deployed. After installing Docker, the Docker service must be started (depending on your OS, you may have to add the local user that uses Docker to the ``docker`` group, refer to the documentation for details) -- [docker-py](https://github.com/docker/docker-py) Python module. +- [docker-compose](https://pypi.org/project/docker-compose/) Python module. + + This also installs the `docker` Python module, which is incompatible with `docker-py`. If you have previously installed `docker-py`, please uninstall it. - [Docker Compose](https://docs.docker.com/compose/install/). ### Pre-build steps