From 97403fbe916767b4148f3064ff04d3fd02c602e5 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Wed, 4 Nov 2015 10:41:36 -0500 Subject: [PATCH] Needed to change env_file syntax, compose test needs secret key base, prod Dockerfile needed temp keys for devise and rails to rake assets precompile --- deploy/docker-compose-prod.yml | 6 ++++-- deploy/docker-compose-test.yml | 2 ++ rails-prod-Dockerfile | 3 +++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/deploy/docker-compose-prod.yml b/deploy/docker-compose-prod.yml index f19f15f..d754666 100644 --- a/deploy/docker-compose-prod.yml +++ b/deploy/docker-compose-prod.yml @@ -5,10 +5,12 @@ app: links: - db restart: always - env_file: prod.env + env_file: + - ./prod.env db: extends: file: docker-compose-common.yml service: db restart: always - env_file: prod.env + env_file: + - ./prod.env diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml index 1391ba6..d9f8466 100644 --- a/deploy/docker-compose-test.yml +++ b/deploy/docker-compose-test.yml @@ -9,6 +9,8 @@ app: - WRESTLINGDEV_DB_HOST=db - WRESTLINGDEV_DB_PORT=3306 - WRESTLINGDEV_DEVISE_SECRET_KEY=2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa + - WRESTLINGDEV_SECRET_KEY_BASE=077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2 + links: - db restart: always diff --git a/rails-prod-Dockerfile b/rails-prod-Dockerfile index 06bb141..389cb5e 100644 --- a/rails-prod-Dockerfile +++ b/rails-prod-Dockerfile @@ -54,6 +54,9 @@ RUN bundle install --without test # Copy site into place. RUN rm -rf /var/www + +ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2 +ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa WORKDIR /var/www/ ADD . /var/www/ #RUN RAILS_ENV=production bundle exec rake db:migrate