Merge pull request #4627 from edx/ikaspriskie/gocd_dev_environment

Ikaspriskie/gocd dev environment

docker.mk

@@ -8,7 +8,7 @@ all_images:=$(patsubst docker/build/%/Dockerfile,%,$(dockerfiles))
 
 # Used in the test.mk file as well.
 images:=$(if $(TRAVIS_COMMIT_RANGE),$(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py),$(all_images))
-
+	
 docker_build=docker.build.
 docker_test=docker.test.
 docker_pkg=docker.pkg.

docker/build/go-server/Dockerfile

 ARG BASE_IMAGE_TAG=latest
 FROM edxops/xenial-common:${BASE_IMAGE_TAG}
 MAINTAINER edxops
-USER root
 
 ADD . /edx/app/edx_ansible/edx_ansible
-WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
+WORKDIR /var/lib/go-server
 
 COPY docker/build/go-server/ansible_overrides.yml /ansible_overrides.yml
 
 ARG OPENEDX_RELEASE=master
 ENV OPENEDX_RELEASE=${OPENEDX_RELEASE}
-RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook go-server.yml \
+
+RUN sudo /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/docker/plays/go-server.yml \
   -c local -i '127.0.0.1,' \
  -t 'install,assets,devstack' \
  --extra-vars="@/ansible_overrides.yml"
 
+USER go
 EXPOSE 8153 8154

docker/build/go-server/ansible_overrides.yml

 ---
 GO_SERVER_ADMIN_USERNAME: "admin"
 GO_SERVER_ADMIN_PASSWORD: "admin"
+
+GO_SERVER_FQDN: localhost