diff --git a/installer/roles/image_build/tasks/main.yml b/installer/roles/image_build/tasks/main.yml index 63bc5d9a1c..4e6f0ad15b 100644 --- a/installer/roles/image_build/tasks/main.yml +++ b/installer/roles/image_build/tasks/main.yml @@ -130,12 +130,6 @@ mode: '0700' delegate_to: localhost -- name: Stage nginx.conf - template: - src: nginx.conf.j2 - dest: "{{ docker_base_path }}/nginx.conf" - delegate_to: localhost - - name: Stage supervisor.conf copy: src: supervisor.conf diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2 index f2c5c0a3a7..b5efafa22a 100644 --- a/installer/roles/image_build/templates/Dockerfile.j2 +++ b/installer/roles/image_build/templates/Dockerfile.j2 @@ -116,7 +116,6 @@ COPY {{ awx_sdist_file }} /tmp/{{ awx_sdist_file }} RUN OFFICIAL=yes /var/lib/awx/venv/awx/bin/pip install /tmp/{{ awx_sdist_file }} ADD settings.py /etc/tower/settings.py -ADD nginx.conf /etc/nginx/nginx.conf ADD supervisor.conf /supervisor.conf ADD supervisor_task.conf /supervisor_task.conf ADD launch_awx.sh /usr/bin/launch_awx.sh diff --git a/installer/roles/local_docker/tasks/compose.yml b/installer/roles/local_docker/tasks/compose.yml index 16171f59a3..cf2d770248 100644 --- a/installer/roles/local_docker/tasks/compose.yml +++ b/installer/roles/local_docker/tasks/compose.yml @@ -13,6 +13,7 @@ - environment.sh - credentials.py - docker-compose.yml + - nginx.conf register: awx_compose_config - name: Render SECRET_KEY file diff --git a/installer/roles/local_docker/templates/docker-compose.yml.j2 b/installer/roles/local_docker/templates/docker-compose.yml.j2 index e53295c58c..2e29c52ef6 100644 --- a/installer/roles/local_docker/templates/docker-compose.yml.j2 +++ b/installer/roles/local_docker/templates/docker-compose.yml.j2 @@ -23,6 +23,7 @@ services: - "{{ docker_compose_dir }}/SECRET_KEY:/etc/tower/SECRET_KEY" - "{{ docker_compose_dir }}/environment.sh:/etc/tower/conf.d/environment.sh" - "{{ docker_compose_dir }}/credentials.py:/etc/tower/conf.d/credentials.py" + - "{{ docker_compose_dir }}/nginx.conf:/etc/nginx/nginx.conf:ro" {% if project_data_dir is defined %} - "{{ project_data_dir +':/var/lib/awx/projects:rw' }}" {% endif %} diff --git a/installer/roles/image_build/templates/nginx.conf.j2 b/installer/roles/local_docker/templates/nginx.conf.j2 similarity index 100% rename from installer/roles/image_build/templates/nginx.conf.j2 rename to installer/roles/local_docker/templates/nginx.conf.j2