From 58e7c3976dea4c80ab8659ab4076db49c88393e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Behmo?= Date: Sun, 6 Jan 2019 22:26:55 +0100 Subject: [PATCH] Simplify forum container configuration Forum environment variables no longer need to be defined in docker-compose. Instead, the default values defined at build time are used. --- build/forum/Dockerfile | 3 +++ deploy/local/templates/docker-compose.yml | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/build/forum/Dockerfile b/build/forum/Dockerfile index 77bc28f..52159cb 100644 --- a/build/forum/Dockerfile +++ b/build/forum/Dockerfile @@ -29,5 +29,8 @@ RUN bundle install --deployment ENV RACK_ENV staging ENV NEW_RELIC_ENABLE false +ENV API_KEY forumapikey +ENV SEARCH_SERVER "http://elasticsearch:9200" +ENV MONGOHQ_URL "mongodb://mongodb/cs_comments_service" EXPOSE 4567 CMD ./bin/unicorn -c config/unicorn_tcp.rb -I '.' diff --git a/deploy/local/templates/docker-compose.yml b/deploy/local/templates/docker-compose.yml index 9ba0ffc..31a173f 100644 --- a/deploy/local/templates/docker-compose.yml +++ b/deploy/local/templates/docker-compose.yml @@ -67,10 +67,6 @@ services: forum: image: regis/openedx-forum:hawthorn - environment: - API_KEY: "forumapikey" - SEARCH_SERVER: "http://elasticsearch:9200" - MONGOHQ_URL: "mongodb://mongodb/cs_comments_service" restart: unless-stopped depends_on: - elasticsearch