From 02102f5ba8e722575be9608e483e6e24d493344c Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Thu, 8 Mar 2018 09:40:02 -0500 Subject: [PATCH] Fix container boots on AppArmor protected systems Link https://github.com/ansible/awx/issues/1297 Signed-off-by: Shane McDonald --- installer/image_build/files/nginx.conf | 3 --- installer/image_build/templates/Dockerfile.j2 | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installer/image_build/files/nginx.conf b/installer/image_build/files/nginx.conf index 3746e869de..2b2defd056 100644 --- a/installer/image_build/files/nginx.conf +++ b/installer/image_build/files/nginx.conf @@ -2,7 +2,6 @@ worker_processes 1; -error_log /dev/stdout warn; pid /tmp/nginx.pid; events { @@ -17,8 +16,6 @@ http { '$status $body_bytes_sent "$http_referer" ' '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /dev/stdout main; - map $http_upgrade $connection_upgrade { default upgrade; '' close; diff --git a/installer/image_build/templates/Dockerfile.j2 b/installer/image_build/templates/Dockerfile.j2 index ab3db53490..13b9f25617 100644 --- a/installer/image_build/templates/Dockerfile.j2 +++ b/installer/image_build/templates/Dockerfile.j2 @@ -55,6 +55,9 @@ RUN chmod +rx /usr/bin/launch_awx.sh && chmod +rx /usr/bin/launch_awx_task.sh && ADD settings.py /etc/tower/settings.py RUN chmod g+w /etc/passwd RUN chmod -R 777 /var/log/nginx && chmod -R 777 /var/lib/nginx +VOLUME /var/lib/nginx +RUN ln -sf /dev/stdout /var/log/nginx/access.log \ + && ln -sf /dev/stderr /var/log/nginx/error.log USER 1000 EXPOSE 8052 WORKDIR /var/lib/awx