From a8e5adbba88ef927233d7da23b29c39eed78f4d7 Mon Sep 17 00:00:00 2001
From: Abheek Tripathy <abheek.tripathy@gmail.com>
Date: Mon, 31 Oct 2022 09:19:43 +0530
Subject: [PATCH 1/2] docker-folder

---
 .env_template => Docker/.env_template         | 0
 Dockerfile => Docker/Dockerfile               | 0
 Dockerfile.celery => Docker/Dockerfile.celery | 0
 docker-compose.yml                            | 6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename .env_template => Docker/.env_template (100%)
 rename Dockerfile => Docker/Dockerfile (100%)
 rename Dockerfile.celery => Docker/Dockerfile.celery (100%)

diff --git a/.env_template b/Docker/.env_template
similarity index 100%
rename from .env_template
rename to Docker/.env_template
diff --git a/Dockerfile b/Docker/Dockerfile
similarity index 100%
rename from Dockerfile
rename to Docker/Dockerfile
diff --git a/Dockerfile.celery b/Docker/Dockerfile.celery
similarity index 100%
rename from Dockerfile.celery
rename to Docker/Dockerfile.celery
diff --git a/docker-compose.yml b/docker-compose.yml
index 9c50dda..959cc9c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
     volumes:
       - ./postgres_data:/var/lib/postgresql/data
     env_file:
-      - ./.env
+      - Docker/.env
 
   # Redis - result backend
   redis:
@@ -27,7 +27,7 @@ services:
     volumes:
       - ./urNode-backend:/app
     env_file:
-      - ./.env
+      - Docker/.env
     links:
       - celery
       - rabbit
@@ -40,7 +40,7 @@ services:
     volumes:
       - "./urNode-backend:/app"
     env_file:
-      - ./.env
+      - Docker/.env
     depends_on:
       - redis
       - postgres

From b1dcf51e5d6ca1293f415a15fadcb9ecec7e31a2 Mon Sep 17 00:00:00 2001
From: Abheek Tripathy <abheek.tripathy@gmail.com>
Date: Tue, 1 Nov 2022 11:40:52 +0530
Subject: [PATCH 2/2] workflows-docker

---
 .github/workflows/publish-image.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
index 748a816..3e5de68 100644
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Build and publish a Docker image for ${{ github.repository }}
         uses: macbre/push-to-ghcr@master
         with:
+          #dockerfile: Docker/Dockerfile
           image_name: ${REPO_LC}-backend
           image_tag: ${{ env.TAG }}
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -46,7 +47,7 @@ jobs:
       - name: Build and publish a Docker image for ${{ github.repository }}
         uses: macbre/push-to-ghcr@master
         with:
-          dockerfile: Dockerfile.celery
+          dockerfile: Docker/Dockerfile.celery
           image_name: ${REPO_LC}-celery-backend
           image_tag: ${{ env.TAG }}
           github_token: ${{ secrets.GITHUB_TOKEN }}