diff options
| author | Evan Stork <estork@live.com> | 2019-10-20 02:45:02 +0200 |
|---|---|---|
| committer | Evan Stork <estork@live.com> | 2019-10-20 02:45:02 +0200 |
| commit | 0c0e172caf7036737a511cbd532b4dc72d900725 (patch) | |
| tree | dcc0bb6b30ab22a2b5aea3b0f2f5bf403c28dc9b | |
| parent | Merge pull request #5035 from keithjgrant/4617-inventory-lookup-error-message (diff) | |
| download | awx-0c0e172caf7036737a511cbd532b4dc72d900725.tar.xz awx-0c0e172caf7036737a511cbd532b4dc72d900725.zip | |
Added custom_venv_dir to local docker install,
Signed-off-by: Evan Stork <estork@live.com>
| -rw-r--r-- | INSTALL.md | 4 | ||||
| -rw-r--r-- | installer/inventory | 3 | ||||
| -rw-r--r-- | installer/roles/local_docker/templates/docker-compose.yml.j2 | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/INSTALL.md b/INSTALL.md index 216b97bc0b..f9b91d78b8 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -456,6 +456,10 @@ Before starting the build process, review the [inventory](./installer/inventory) > When using docker-compose, the `docker-compose.yml` file will be created there (default `/tmp/awxcompose`). +*custom_venv_dir* + +> Adds the custom venv environments from the local host to be passed into the containers at install. + *ca_trust_dir* > If you're using a non trusted CA, provide a path where the untrusted Certs are stored on your Host. diff --git a/installer/inventory b/installer/inventory index 39e8b6b433..ed7fa16afd 100644 --- a/installer/inventory +++ b/installer/inventory @@ -137,6 +137,9 @@ secret_key=awxsecret # it manages from the docker host, you can set this to turn it into a volume for the container. #project_data_dir=/var/lib/awx/projects +# AWX custom virtual environment folder. Only usable for local isntall. +#custom_venv_dir=/opt/my-envs/ + # CA Trust directory. If you need to provide custom CA certificates, supplying # this variable causes this directory on the host to be bind mounted over # /etc/pki/ca-trust in the awx_task and awx_web containers. diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index e3956b7374..e53295c58c 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -26,6 +26,9 @@ services: {% if project_data_dir is defined %} - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}" {% endif %} + {% if custom_venv_dir is defined %} + - "{{ custom_venv_dir +':'+ custom_venv_dir +':rw' }}" + {% endif %} {% if ca_trust_dir is defined %} - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} @@ -75,6 +78,9 @@ services: {% if project_data_dir is defined %} - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}" {% endif %} + {% if custom_venv_dir is defined %} + - "{{ custom_venv_dir +':'+ custom_venv_dir +':rw' }}" + {% endif %} {% if ca_trust_dir is defined %} - "{{ ca_trust_dir +':/etc/pki/ca-trust/source/anchors:ro' }}" {% endif %} |