Merge pull request #3122 from edx/michael/forum-dir

Rename folders directory to folder to match docker/plays/forum.yml

docker/build/forums/Dockerfile → docker/build/forum/Dockerfile

@@ -3,11 +3,11 @@ MAINTAINER edxops
 
 WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
 ADD . /edx/app/edx_ansible/edx_ansible
-COPY docker/build/forums/ansible_overrides.yml /
+COPY docker/build/forum/ansible_overrides.yml /
 RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook forum.yml \
     -i '127.0.0.1,' -c local \
     -t "install:base,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"]
-EXPOSE 4567
\ No newline at end of file
+EXPOSE 4567

docker/compose/edx/docker-compose.yml

@@ -88,12 +88,12 @@ rabbitmq:
     - 5672:5672
 
 
-forums:
-  container_name: forums
+forum:
+  container_name: forum
   # Image built from the opencraft fork as it fixes
   # an auth bug.  Update when the change merges
   # upstream
-  image: edxops/forums:opencraft-v2
+  image: edxops/forum:opencraft-v2
   volumes:
     - ${DOCKER_EDX_ROOT}/cs_comments_service:/edx/app/forum/cs_comments_service
   ports: