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

Upgrade to mysql 5.7, tag memcached 1.5, and check for PID 1 on workers instead of ps. ps generates apparmor errors in the docker daemon.

Browse Source
This commit is contained in:
Jacob Cody Wimer
2018-07-24 13:58:59 +00:00
parent 9183a16d5d
commit cb22111c3c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@ services:
test: curl --insecure https://127.0.0.1/ test: curl --insecure https://127.0.0.1/
db: db:
image: mysql:5.5 image: mysql:5.7
ports: ports:
- "3306:3306" - "3306:3306"
volumes: volumes:
@@ -42,12 +42,12 @@ services:
env_file: env_file:
- ./prod.env - ./prod.env
healthcheck: healthcheck:
test: ps -ef | grep rake | grep ruby test: kill -0 1
command: bundle exec rake jobs:work RAILS_ENV=production command: bundle exec rake jobs:work RAILS_ENV=production
memcached: memcached:
image: memcached image: memcached:1.5
mem_limit: 64000000 mem_limit: 64000000
restart: always restart: always
networks: networks:

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

@@ -42,7 +42,7 @@ services:
test: curl --insecure https://127.0.0.1/ test: curl --insecure https://127.0.0.1/
db: db:
image: mysql:5.5 image: mysql:5.7
ports: ports:
- "3306:3306" - "3306:3306"
volumes: volumes:
@@ -82,7 +82,7 @@ services:
caching: caching:
restart: always restart: always
healthcheck: healthcheck:
test: ps -ef | grep rake | grep ruby test: kill -0 1
command: bundle exec rake jobs:work RAILS_ENV=production command: bundle exec rake jobs:work RAILS_ENV=production
deploy: deploy:
resources: resources:
@@ -94,7 +94,7 @@ services:
memory: 256M memory: 256M
memcached: memcached:
image: memcached image: memcached:1.5
deploy: deploy:
resources: resources:
limits: limits: