cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-25 15:31:39 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Jacob Cody Wimer
2018-07-31 15:04:09 +00:00
parent baa8a2fea5 c62f017bec
commit 4b05833a33
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Gemfile
View File

@@ -55,6 +55,7 @@ gem 'delayed_job_active_record'
gem 'puma' gem 'puma'
gem 'passenger' gem 'passenger'
gem 'tzinfo-data' gem 'tzinfo-data'
gem 'daemons'
group :development do group :development do
gem 'rubocop' gem 'rubocop'

2
deploy/docker-compose-prod-full-stack.yml
View File

@@ -43,7 +43,7 @@ services:
- ./prod.env - ./prod.env
healthcheck: healthcheck:
test: kill -0 1 test: kill -0 1
command: bundle exec rake jobs:work RAILS_ENV=production command: bundle exec bin/delayed_job -n 1 run
memcached: memcached:

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

@@ -13,6 +13,7 @@ services:
context: ../ context: ../
dockerfile: ./deploy/rails-prod-Dockerfile dockerfile: ./deploy/rails-prod-Dockerfile
environment: environment:
- RAILS_ENV=production
- WRESTLINGDEV_DB_NAME=wrestlingtourney - WRESTLINGDEV_DB_NAME=wrestlingtourney
- WRESTLINGDEV_DB_USR=root - WRESTLINGDEV_DB_USR=root
- WRESTLINGDEV_DB_PWD=password - WRESTLINGDEV_DB_PWD=password
@@ -64,6 +65,7 @@ services:
worker: worker:
image: wrestlingdev image: wrestlingdev
environment: environment:
- RAILS_ENV=production
- WRESTLINGDEV_DB_NAME=wrestlingtourney - WRESTLINGDEV_DB_NAME=wrestlingtourney
- WRESTLINGDEV_DB_USR=root - WRESTLINGDEV_DB_USR=root
- WRESTLINGDEV_DB_PWD=password - WRESTLINGDEV_DB_PWD=password
@@ -80,7 +82,7 @@ services:
restart: always restart: always
healthcheck: healthcheck:
test: kill -0 1 test: kill -0 1
command: bundle exec rake jobs:work RAILS_ENV=production command: bundle exec bin/delayed_job -n 1 run
deploy: deploy:
resources: resources:
limits: limits: