External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-05 16:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix container boots on AppArmor protected systems

Browse Source 
Link https://github.com/ansible/awx/issues/1297

Signed-off-by: Shane McDonald <me@shanemcd.com>
This commit is contained in:
Shane McDonald
2018-03-08 09:40:02 -05:00
parent 2861397433
commit 02102f5ba8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
installer/image_build/files/nginx.conf
View File

@@ -2,7 +2,6 @@
worker_processes 1; worker_processes 1;
error_log /dev/stdout warn;
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
events { events {
@@ -17,8 +16,6 @@ http {
'$status $body_bytes_sent "$http_referer" ' '$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"$http_user_agent" "$http_x_forwarded_for"';
access_log /dev/stdout main;
map $http_upgrade $connection_upgrade { map $http_upgrade $connection_upgrade {
default upgrade; default upgrade;
'' close; '' close;

3
installer/image_build/templates/Dockerfile.j2
View File

@@ -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 ADD settings.py /etc/tower/settings.py
RUN chmod g+w /etc/passwd RUN chmod g+w /etc/passwd
RUN chmod -R 777 /var/log/nginx && chmod -R 777 /var/lib/nginx 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 USER 1000
EXPOSE 8052 EXPOSE 8052
WORKDIR /var/lib/awx WORKDIR /var/lib/awx