Merge pull request #3227 from edx/michael/ecommerce-docker

Bug fixes to analytics_api, insights Dockerfiles and life-cycle tags in supervisor tasks file

docker/build/analytics_api/Dockerfile

@@ -10,5 +10,5 @@ WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 COPY docker/build/analytics_api/ansible_overrides.yml /
 RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook analytics_api.yml -i '127.0.0.1,' -c local -t "install:base,install:system-requirements,install:configuration,install:app-requirements,install:code" -e@/ansible_overrides.yml
 WORKDIR /edx/app/
-CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord -n --configuration /edx/app/supervisor/supervisord.conf"]
+CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
 EXPOSE 443 80

docker/build/insights/Dockerfile

@@ -8,5 +8,5 @@ RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook insights.yml \
     -i '127.0.0.1,' -c local \
     -t "install:base,install:system-requirements,install:configuration,install:app-requirements,install:code" \
     -e@/ansible_overrides.yml
-CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord -n --configuration /edx/app/supervisor/supervisord.conf"]
+CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
 EXPOSE 8110 18110

playbooks/roles/supervisor/tasks/main.yml

@@ -160,7 +160,7 @@
     mode: "0644"
   tags:
     - install
-    - install:config
+    - install:configuration
 
 # this link is deprecated in favor of the shell wrapper
 - name: Remove a symlink for supervisortctl
@@ -171,7 +171,7 @@
   when: supervisor_service == "supervisor"
   tags:
     - install
-    - install:config
+    - install:configuration
 
 # these links are deprecated in favor of the shell wrapper
 - name: Remove symlink for supervisor cfg
@@ -185,7 +185,7 @@
     - "{{ supervisor_cfg_dir }}"
   tags:
     - install
-    - install:config
+    - install:configuration
 
 - name: Create helper script for running supervisor
   template:
@@ -196,7 +196,7 @@
   when: supervisor_service == "supervisor"
   tags:
     - install
-    - install:config
+    - install:configuration
 
 - name: Start supervisor
   service: