From ce982ae1c2ce4b022aa0ab5615d956bb40925336 Mon Sep 17 00:00:00 2001
From: Michael Derynck <michael.derynck@grafana.com>
Date: Mon, 20 Jun 2022 09:29:37 -0600
Subject: [PATCH] Tweak docker-compose (#104)

* Remove env var causing celery container to exit, put containers in their own network

* Remove unnecessary network, remove version since we are mixing, make DB and redis ports internal

* Restore property for CELERY_WORKER_SHUTDOWN_INVERVAL since restart policy added
---
 docker-compose.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 894b26fe..bf44777b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,6 @@ services:
         condition: service_started
 
   celery:
-    # TODO: change to the public image once it's public
     image: grafana/oncall
     restart: always
     command: sh -c "./celery_with_exporter.sh"
@@ -102,8 +101,8 @@ services:
     cpus: 0.5
     command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
     restart: always
-    ports:
-      - 3306:3306
+    expose:
+      - 3306
     volumes:
       - dbdata:/var/lib/mysql
     environment:
@@ -119,8 +118,8 @@ services:
     mem_limit: 100m
     cpus: 0.1
     restart: always
-    ports:
-      - 6379:6379
+    expose:
+      - 6379
 
   rabbitmq:
     image: "rabbitmq:3.7.15-management"