Merge pull request #120 from dhollinger/docker-compose

Update docker-compose file
voxpupuli · Mar 9, 2020 · 2987afb · 2987afb
2 parents 2359ade + 09f12ba
commit 2987afb
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
@@ -7,10 +7,12 @@ services:
       - "9292:9292"
     environment:
       - REDIS_URL=redis://redis:6379/0
+      - SINATRA_ENV=production
+      - WEBHOOK_CONFDIR=/config/webhook.yaml
     volumes:
       - "/etc/puppetlabs/code:/puppetlabs/codedir"
-      - "/etc/puppetlabs/webhook/config.yml:/app/config/config.yml"
-      - "/etc/puppetlabs/r10k/r10k.yaml:/etc/r10k.yaml"
+      - "/etc/voxpupuli/:/config"
+      - "/etc/puppetlabs/r10k:/etc/r10k"
   redis:
     image: "redis:alpine"
   sidekiq:
@@ -19,10 +21,12 @@ services:
     command: "bash -c 'cd app/ && bundle exec sidekiq -r /app/config/environment.rb'"
     environment:
       - REDIS_URL=redis://redis:6379/0
+      - SINATRA_ENV=production
+      - WEBHOOK_CONFDIR=/config/webhook.yaml
     volumes:
-      - "/etc/puppetlabs/etc/code:/puppetlabs/codedir"
-      - "/etc/puppetlabs/webhook/config.yml:/app/config/config.yml"
-      - "/etc/puppetlabs/r10k/r10k.yaml:/etc/r10k.yaml"
+      - "/etc/puppetlabs/code:/puppetlabs/codedir"
+      - "/etc/voxpupuli/:/config"
+      - "/etc/puppetlabs/r10k:/etc/r10k"
       - "/root/.ssh/id_rsa:/root/.ssh/id_rsa"
     depends_on:
       - app