cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-09 23:44:52 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-11-04 10:41:36 -05:00
parent 78e63780ae
commit 97403fbe91
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
deploy/docker-compose-prod.yml
View File

@@ -5,10 +5,12 @@ app:
links: links:
- db - db
restart: always restart: always
env_file: prod.env env_file:
- ./prod.env
db: db:
extends: extends:
file: docker-compose-common.yml file: docker-compose-common.yml
service: db service: db
restart: always restart: always
env_file: prod.env env_file:
- ./prod.env

2
deploy/docker-compose-test.yml
View File

@@ -9,6 +9,8 @@ app:
- WRESTLINGDEV_DB_HOST=db - WRESTLINGDEV_DB_HOST=db
- WRESTLINGDEV_DB_PORT=3306 - WRESTLINGDEV_DB_PORT=3306
- WRESTLINGDEV_DEVISE_SECRET_KEY=2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa - WRESTLINGDEV_DEVISE_SECRET_KEY=2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
- WRESTLINGDEV_SECRET_KEY_BASE=077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
links: links:
- db - db
restart: always restart: always

3
rails-prod-Dockerfile
View File

@@ -54,6 +54,9 @@ RUN bundle install --without test
# Copy site into place. # Copy site into place.
RUN rm -rf /var/www RUN rm -rf /var/www
ENV WRESTLINGDEV_SECRET_KEY_BASE 077cdbef5c2ccf22543fb17a67339f234306b7fa2e1e4463d851c444c10a5611829a2290b253da78339427f131571fac9a42c83d960b2d25ecc10a4a0a7ce1a2
ENV WRESTLINGDEV_DEVISE_SECRET_KEY 2f29d49db6704377ba263f7cb9db085b386bcb301c0cd501126a674686ab1a109754071165b08cd72af03cec4642a4dd04361c994462254dd5d85e9594e8b9aa
WORKDIR /var/www/ WORKDIR /var/www/
ADD . /var/www/ ADD . /var/www/
#RUN RAILS_ENV=production bundle exec rake db:migrate #RUN RAILS_ENV=production bundle exec rake db:migrate