From cb22111c3c7fd9ebcfff8e75dd7534e37125ef51 Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Tue, 24 Jul 2018 13:58:59 +0000 Subject: [PATCH] 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. --- deploy/docker-compose-prod-full-stack.yml | 6 +++--- deploy/docker-compose-test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/docker-compose-prod-full-stack.yml b/deploy/docker-compose-prod-full-stack.yml index a94f6a9..8683b5f 100644 --- a/deploy/docker-compose-prod-full-stack.yml +++ b/deploy/docker-compose-prod-full-stack.yml @@ -22,7 +22,7 @@ services: test: curl --insecure https://127.0.0.1/ db: - image: mysql:5.5 + image: mysql:5.7 ports: - "3306:3306" volumes: @@ -42,12 +42,12 @@ services: env_file: - ./prod.env healthcheck: - test: ps -ef | grep rake | grep ruby + test: kill -0 1 command: bundle exec rake jobs:work RAILS_ENV=production memcached: - image: memcached + image: memcached:1.5 mem_limit: 64000000 restart: always networks: diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml index 1142ee3..d58339f 100644 --- a/deploy/docker-compose-test.yml +++ b/deploy/docker-compose-test.yml @@ -42,7 +42,7 @@ services: test: curl --insecure https://127.0.0.1/ db: - image: mysql:5.5 + image: mysql:5.7 ports: - "3306:3306" volumes: @@ -82,7 +82,7 @@ services: caching: restart: always healthcheck: - test: ps -ef | grep rake | grep ruby + test: kill -0 1 command: bundle exec rake jobs:work RAILS_ENV=production deploy: resources: @@ -94,7 +94,7 @@ services: memory: 256M memcached: - image: memcached + image: memcached:1.5 deploy: resources: limits: