From cb806b16999933624930444d32132812ae7bee73 Mon Sep 17 00:00:00 2001 From: Jeff Byrnes Date: Wed, 3 Apr 2019 11:17:12 -0400 Subject: [PATCH] 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"