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

Updating to compose api version 3.3

Browse Source
This commit is contained in:
Jacob Cody Wimer
2018-07-11 13:23:17 +00:00
parent cdf42b4434
commit cd94b9901d
4 changed files with 154 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
deploy/deploy-test.sh
View File

@@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
project_dir="$(dirname $( dirname $(readlink -f ${BASH_SOURCE[0]})))" 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 kill
#docker-compose -f ${project_dir}/deploy/docker-compose-test.yml pull
docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d docker-compose -f ${project_dir}/deploy/docker-compose-test.yml up -d
echo Make sure your local mysql database has a wrestlingtourney db 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: app:
extends:
file: docker-compose-common.yml
service: app
image: wrestlingdev-prod image: wrestlingdev-prod
links: ports:
- db - "80:80"
- "443:443"
networks:
database:
caching:
restart: always restart: always
env_file: env_file:
- ./prod.env - ./prod.env
healthcheck:
test: curl --insecure https://127.0.0.1/
db: db:
extends: image: mysql:5.5
file: docker-compose-common.yml ports:
service: db - "3306:3306"
volumes:
- mysql:/var/lib/mysql
restart: always restart: always
env_file: env_file:
- ./prod.env - ./prod.env
networks:
database:
worker: worker:
extends:
file: docker-compose-common.yml
service: worker
image: wrestlingdev-prod image: wrestlingdev-prod
links: networks:
- db database:
caching:
restart: always restart: always
env_file: env_file:
- ./prod.env - ./prod.env
@@ -29,8 +45,10 @@ worker:
test: ps -ef | grep rake | grep ruby test: ps -ef | grep rake | grep ruby
command: bundle exec rake jobs:work RAILS_ENV=production command: bundle exec rake jobs:work RAILS_ENV=production
memcached: memcached:
extends: image: memcached
file: docker-compose-common.yml mem_limit: 64000000
service: memcached
restart: always restart: always
networks:
caching:

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

@@ -1,8 +1,14 @@
version: "3.3"
networks:
database:
caching:
volumes:
mysql:
services:
app: app:
image: registry:5000/wrestlingdev:dev image: wrestlingdev:dev
extends:
file: docker-compose-common.yml
service: app
environment: environment:
- WRESTLINGDEV_DB_NAME=wrestlingtourney - WRESTLINGDEV_DB_NAME=wrestlingtourney
- WRESTLINGDEV_DB_USR=root - WRESTLINGDEV_DB_USR=root
@@ -14,24 +20,46 @@ app:
- MEMCACHIER_SERVERS=memcached:11211 - MEMCACHIER_SERVERS=memcached:11211
- MEMCACHIER_USERNAME= - MEMCACHIER_USERNAME=
- MEMCACHIER_PASSWORD= - MEMCACHIER_PASSWORD=
links: networks:
- db database:
- memcached caching:
restart: always 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: db:
extends: image: mysql:5.5
file: docker-compose-common.yml ports:
service: db - "3306:3306"
volumes:
- mysql:/var/lib/mysql
environment: environment:
- MYSQL_ROOT_PASSWORD=password - MYSQL_ROOT_PASSWORD=password
restart: always restart: always
networks:
database:
deploy:
resources:
limits:
cpus: '0.25'
memory: 512M
reservations:
cpus: '0.25'
memory: 256M
worker: worker:
image: registry:5000/wrestlingdev:dev image: wrestlingdev:dev
extends:
file: docker-compose-common.yml
service: worker
environment: environment:
- WRESTLINGDEV_DB_NAME=wrestlingtourney - WRESTLINGDEV_DB_NAME=wrestlingtourney
- WRESTLINGDEV_DB_USR=root - WRESTLINGDEV_DB_USR=root
@@ -43,17 +71,33 @@ worker:
- MEMCACHIER_SERVERS=memcached:11211 - MEMCACHIER_SERVERS=memcached:11211
- MEMCACHIER_USERNAME= - MEMCACHIER_USERNAME=
- MEMCACHIER_PASSWORD= - MEMCACHIER_PASSWORD=
links: networks:
- db database:
- memcached caching:
restart: always restart: always
healthcheck: healthcheck:
test: ps -ef | grep rake | grep ruby test: ps -ef | grep rake | grep ruby
command: bundle exec rake jobs:work RAILS_ENV=production command: bundle exec rake jobs:work RAILS_ENV=production
deploy:
resources:
limits:
cpus: '0.25'
memory: 512M
reservations:
cpus: '0.25'
memory: 256M
memcached: memcached:
extends: image: memcached
file: docker-compose-common.yml deploy:
service: memcached resources:
limits:
cpus: '0.10'
memory: 64M
reservations:
cpus: '0.10'
memory: 64M
restart: always restart: always
networks:
caching: