From 2083186b7840f5751cf8f797b14e126fdab728ed Mon Sep 17 00:00:00 2001 From: Jacob Cody Wimer Date: Mon, 13 Aug 2018 11:43:42 +0000 Subject: [PATCH] Use compose 2.2 for docker compose to add the ability to use mem_limit for memcached --- deploy/docker-compose-prod-full-stack.yml | 2 +- deploy/docker-compose-test.yml | 35 ++--------------------- 2 files changed, 3 insertions(+), 34 deletions(-) diff --git a/deploy/docker-compose-prod-full-stack.yml b/deploy/docker-compose-prod-full-stack.yml index f7702cc..48e5be2 100644 --- a/deploy/docker-compose-prod-full-stack.yml +++ b/deploy/docker-compose-prod-full-stack.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "2.2" networks: database: caching: diff --git a/deploy/docker-compose-test.yml b/deploy/docker-compose-test.yml index 35ed9b2..b2c8355 100644 --- a/deploy/docker-compose-test.yml +++ b/deploy/docker-compose-test.yml @@ -1,4 +1,4 @@ -version: "3.3" +version: "2.2" networks: database: caching: @@ -31,14 +31,6 @@ services: 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/ @@ -53,14 +45,6 @@ services: restart: always networks: database: - deploy: - resources: - limits: - cpus: '0.25' - memory: 512M - reservations: - cpus: '0.25' - memory: 256M worker: image: wrestlingdev @@ -83,25 +67,10 @@ services: healthcheck: test: kill -0 1 command: bundle exec bin/delayed_job -n 1 run - deploy: - resources: - limits: - cpus: '0.25' - memory: 512M - reservations: - cpus: '0.25' - memory: 256M memcached: image: memcached:1.5 - deploy: - resources: - limits: - cpus: '0.10' - memory: 64M - reservations: - cpus: '0.10' - memory: 64M + mem_limit: 64000000 restart: always networks: caching: