Merge pull request #7184 from wenottingham/a-preview-of-whats-to-come

Remove dev env futzing of supervisord.conf permissions

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

tools/docker-compose-cluster.yml

@@ -31,6 +31,7 @@ services:
       - "../:/awx_devel"
       - "./redis/redis_socket_ha_1:/var/run/redis/"
       - "./memcached/:/var/run/memcached"
+      - "./docker-compose/supervisor.conf:/etc/supervisord.conf"
     ports:
       - "5899-5999:5899-5999"
   awx-2:
@@ -50,6 +51,7 @@ services:
       - "../:/awx_devel"
       - "./redis/redis_socket_ha_2:/var/run/redis/"
       - "./memcached/:/var/run/memcached"
+      - "./docker-compose/supervisor.conf:/etc/supervisord.conf"
     ports:
       - "7899-7999:7899-7999"
   awx-3:
@@ -69,6 +71,7 @@ services:
       - "../:/awx_devel"
       - "./redis/redis_socket_ha_3:/var/run/redis/"
       - "./memcached/:/var/run/memcached"
+      - "./docker-compose/supervisor.conf:/etc/supervisord.conf"
     ports:
       - "8899-8999:8899-8999"
   redis_1:

tools/docker-compose.yml

@@ -35,6 +35,7 @@ services:
       - "./redis/redis_socket_standalone:/var/run/redis/"
       - "./memcached/:/var/run/memcached"
       - "./rsyslog/:/var/lib/awx/rsyslog"
+      - "./docker-compose/supervisor.conf:/etc/supervisord.conf"
     privileged: true
     tty: true
   # A useful container that simply passes through log messages to the console

tools/docker-compose/bootstrap_development.sh

@@ -20,7 +20,6 @@ else
 fi
 
 make awx-link
-yes | cp -rf /awx_devel/tools/docker-compose/supervisor.conf /etc/supervisord.conf
 
 # AWX bootstrapping
 make version_file