Merge pull request #1471 from shanemcd/devel

Fix container boots on AppArmor protected systems

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;

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

installer/kubernetes/templates/deployment.yml.j2

@@ -15,6 +15,7 @@ spec:
       containers:
         - name: awx-web
           image: {{ awx_web_kubernetes_image }}
+          imagePullPolicy: Always
           ports:
             - containerPort: 8052
           volumeMounts:
@@ -22,6 +23,7 @@ spec:
               name: awx-application-config
         - name: awx-celery
           image: {{ awx_task_kubernetes_image }}
+          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /etc/tower
               name: awx-application-config

installer/openshift/templates/deployment.yml.j2

@@ -15,6 +15,7 @@ spec:
       containers:
         - name: awx-web
           image: {{ awx_web_openshift_image }}
+          imagePullPolicy: Always
           ports:
             - containerPort: 8052
           volumeMounts:
@@ -22,6 +23,7 @@ spec:
               name: awx-application-config
         - name: awx-celery
           image: {{ awx_task_openshift_image }}
+          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /etc/tower
               name: awx-application-config