From 916ad8613f246253bedea2d20fec5b908c2deb82 Mon Sep 17 00:00:00 2001
From: a-nassif <anassif@qrf.org>
Date: Mon, 18 Apr 2022 15:47:57 +0300
Subject: [PATCH 1/3] fix progs image build

---
 docker-compose-progs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 3ca970fa16..fa95dde3e0 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -13,7 +13,7 @@ version: "2.1"
 services:
 
   progs:
-    image: eu.gcr.io/openedx-231314/edraak/progs
+    image: eu.gcr.io/openedx-231314/edraak/progs:latest
     environment:
       PROGS_CFG: /app/docker.json
       NODE_ENV: development

From db0936acbdf88c6ec8d02fa978365de68cd00a84 Mon Sep 17 00:00:00 2001
From: Ahmad Abuwardeh <ahmad@Ahmads-MacBook-Pro.local>
Date: Tue, 19 Apr 2022 11:29:39 +0300
Subject: [PATCH 2/3] add celery and redis contianer to docker-compose

---
 docker-compose-b2b.yml   | 2 +-
 docker-compose-progs.yml | 8 ++++++++
 docker-compose.yml       | 3 +++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/docker-compose-b2b.yml b/docker-compose-b2b.yml
index 187da8578f..54ac7b51a2 100644
--- a/docker-compose-b2b.yml
+++ b/docker-compose-b2b.yml
@@ -13,7 +13,7 @@ version: "2.1"
 services:
 
   b2b:
-    image: eu.gcr.io/openedx-231314/edraak/progs
+    image: eu.gcr.io/openedx-231314/edraak/progs:latest
     environment:
       PROGS_CFG: /app/docker-b2b.json
       NODE_ENV: development
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index fa95dde3e0..d597ef32ec 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -31,6 +31,14 @@ services:
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
       - ~/.ssh/:/root/.ssh
 
+  celery:
+    image: eu.gcr.io/openedx-231314/edraak/progs:latest
+    container_name: edraak.devstack.programs.celery
+    command: celery -A edraakprograms worker -l INFO
+    restart: always
+    depends_on:
+      - redis
+
   router:
     depends_on:
       - progs
diff --git a/docker-compose.yml b/docker-compose.yml
index 646f1d4ae2..3d54f5b500 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -77,6 +77,9 @@ services:
           - analytics.edraak.dev
           - auth.edraak.dev
 
+  redis:
+        image: "redis:alpine"
+
 volumes:
   elasticsearch_data:
   mongo_data:

From 557330c1e0840cf42c5a644c9f685ce19055469e Mon Sep 17 00:00:00 2001
From: a-nassif <anassif@qrf.org>
Date: Tue, 19 Apr 2022 12:14:45 +0300
Subject: [PATCH 3/3] Add volumes and workdir to celery service - add volumes -
 fix workdir - adjust command to nohup

---
 docker-compose-progs.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index d597ef32ec..b32003ef64 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -33,11 +33,18 @@ services:
 
   celery:
     image: eu.gcr.io/openedx-231314/edraak/progs:latest
+    environment:
+      PROGS_CFG: /app/docker.json
     container_name: edraak.devstack.programs.celery
-    command: celery -A edraakprograms worker -l INFO
+    command: bash -c 'while true; do celery -A edraakprograms worker -l INFO; sleep 2; done'
     restart: always
+    working_dir: /app
     depends_on:
       - redis
+    volumes:
+      - progs_media:/edx/var/progs/media
+      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+      - ~/.ssh/:/root/.ssh
 
   router:
     depends_on: