cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Jacob Cody Wimer
2018-07-17 11:48:16 +00:00
parent edd47ba427 933aa522b7
commit 2b98a6d96b
8 changed files with 170 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Gemfile
View File

@@ -52,7 +52,8 @@ gem 'cancancan'
gem 'round_robin_tournament'
gem 'rb-readline'
gem 'delayed_job_active_record'
gem 'puma'
#gem 'puma'
gem 'passenger'
gem 'travis'
group :development do

6
Gemfile.lock
View File

@@ -151,8 +151,10 @@ GEM
parallel (1.12.1)
parser (2.5.1.0)
ast (~> 2.4.0)
passenger (5.3.3)
rack
rake (>= 0.8.1)
powerpack (0.1.2)
puma (3.11.4)
pusher-client (0.6.2)
json
websocket (~> 1.0)
@@ -275,7 +277,7 @@ DEPENDENCIES
jquery-rails
mysql2
newrelic_rpm
puma
passenger
rails (= 5.2.0)
rails_12factor
rb-readline

3
Procfile
View File

@@ -1,2 +1,3 @@
worker: bundle exec rake jobs:work
web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}
#web: bundle exec puma -t 5:5 -p ${PORT:-3000} -e ${RACK_ENV:-development}
web: bundle exec passenger start -p $PORT --max-pool-size 3

3
deploy/deploy-test.sh
View File

@@ -1,7 +1,8 @@
#!/bin/bash
project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))"
docker build -t wrestlingdev -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
#docker build -t wrestlingdev:test -f ${project_dir}/deploy/rails-prod-Dockerfile ${project_dir}
docker-compose -f ${project_dir}/deploy/docker-compose-test.yml kill
docker-compose -f ${project_dir}/deploy/docker-compose-test.yml build
docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
echo Make sure your local mysql database has a wrestlingtourney db

25
deploy/docker-compose-common.yml
View File

@@ -1,25 +0,0 @@
app:
image: wrestlingdev
ports:
- "80:80"
- "443:443"
jobs:
image: wrestlingdev
command: bundle exec rake:jobs
db:
image: mysql:5.5
ports:
- "3306:3306"
volumes:
- /srv/docker/mysql:/var/lib/mysql
email:
image: postfix
memcached:
image: memcached
mem_limit: 64000000
worker:
image: wrestlingdev
command: /bin/bash -c "cd /rails && bundle exec rake jobs:work RAILS_ENV=production"

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

@@ -1,27 +1,43 @@
version: "3.3"
networks:
database:
caching:
volumes:
mysql:
services:
app:
extends:
file: docker-compose-common.yml
service: app
image: wrestlingdev-prod
links:
- db
ports:
- "80:80"
- "443:443"
networks:
database:
caching:
restart: always
env_file:
- ./prod.env
healthcheck:
test: curl --insecure https://127.0.0.1/
db:
extends:
file: docker-compose-common.yml
service: db
image: mysql:5.5
ports:
- "3306:3306"
volumes:
- mysql:/var/lib/mysql
restart: always
env_file:
- ./prod.env
networks:
database:
worker:
extends:
file: docker-compose-common.yml
service: worker
image: wrestlingdev-prod
links:
- db
networks:
database:
caching:
restart: always
env_file:
- ./prod.env
@@ -29,8 +45,10 @@ worker:
test: ps -ef | grep rake | grep ruby
command: bundle exec rake jobs:work RAILS_ENV=production
memcached:
extends:
file: docker-compose-common.yml
service: memcached
image: memcached
mem_limit: 64000000
restart: always
networks:
caching:

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

@@ -1,8 +1,17 @@
version: "3.3"
networks:
database:
caching:
volumes:
mysql:
services:
app:
image: registry:5000/wrestlingdev:dev
extends:
file: docker-compose-common.yml
service: app
image: wrestlingdev
build:
context: ../
dockerfile: ./deploy/rails-prod-Dockerfile
environment:
- WRESTLINGDEV_DB_NAME=wrestlingtourney
- WRESTLINGDEV_DB_USR=root
@@ -14,24 +23,49 @@ app:
- MEMCACHIER_SERVERS=memcached:11211
- MEMCACHIER_USERNAME=
- MEMCACHIER_PASSWORD=
links:
- db
- memcached
networks:
database:
caching:
restart: always
ports:
- "80:80"
- "443:443"
deploy:
resources:
limits:
cpus: '0.25'
memory: 512M
reservations:
cpus: '0.25'
memory: 256M
healthcheck:
test: curl --insecure https://127.0.0.1/
db:
extends:
file: docker-compose-common.yml
service: db
image: mysql:5.5
ports:
- "3306:3306"
volumes:
- mysql:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD=password
restart: always
networks:
database:
deploy:
resources:
limits:
cpus: '0.25'
memory: 512M
reservations:
cpus: '0.25'
memory: 256M
worker:
image: registry:5000/wrestlingdev:dev
extends:
file: docker-compose-common.yml
service: worker
image: wrestlingdev
build:
context: ../
dockerfile: ./deploy/rails-prod-Dockerfile
environment:
- WRESTLINGDEV_DB_NAME=wrestlingtourney
- WRESTLINGDEV_DB_USR=root
@@ -43,17 +77,33 @@ worker:
- MEMCACHIER_SERVERS=memcached:11211
- MEMCACHIER_USERNAME=
- MEMCACHIER_PASSWORD=
links:
- db
- memcached
networks:
database:
caching:
restart: always
healthcheck:
test: ps -ef | grep rake | grep ruby
command: bundle exec rake jobs:work RAILS_ENV=production
deploy:
resources:
limits:
cpus: '0.25'
memory: 512M
reservations:
cpus: '0.25'
memory: 256M
memcached:
extends:
file: docker-compose-common.yml
service: memcached
image: memcached
deploy:
resources:
limits:
cpus: '0.10'
memory: 64M
reservations:
cpus: '0.10'
memory: 64M
restart: always
networks:
caching:

3
deploy/rails-prod-Dockerfile
View File

@@ -70,4 +70,5 @@ RUN RAILS_ENV=production bundle exec rake assets:precompile
# By default, simply start puma.
WORKDIR /rails
CMD bundle exec puma -t 5:5 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt' -e production
#CMD bundle exec puma -t 3:3 -b 'ssl://0.0.0.0:443?key=/ssl/server.key&verify_mode=none&cert=/ssl/server.crt' -e production
CMD bundle exec passenger start -p 443 --max-pool-size 3 --environment production --ssl --ssl-certificate /ssl/server.crt --ssl-certificate-key /ssl/server.key