From e708bb7a1187cd9c09e513d5e71dc4385953cbfa Mon Sep 17 00:00:00 2001
From: Hoan Nguyen <hoan.nguyen01@axonactive.com>
Date: Fri, 1 Nov 2024 10:30:53 +0700
Subject: [PATCH 1/2] MARP-1199 DEV instance refers to the config of the ci
 build - Missing network

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

diff --git a/marketplace-build/docker-compose.yml b/marketplace-build/docker-compose.yml
index 4fc1e9f3..74011c3a 100644
--- a/marketplace-build/docker-compose.yml
+++ b/marketplace-build/docker-compose.yml
@@ -15,6 +15,8 @@ services:
       - marketcache:/usr/share/nginx/html/market-cache
     ports:
       - "4200:80"
+    networks:
+      - marketplace-network
 
   service:
     container_name: marketplace-service
@@ -41,7 +43,12 @@ services:
         - BUILD_VERSION=${BUILD_VERSION}
     ports:
       - "8080:8080"
+    networks:
+      - marketplace-network
 
 volumes:
-  mongodata:
   marketcache:
+
+networks:
+  marketplace-network:
+    external: true
\ No newline at end of file

From d82819ff9abbf3fd17fe2e3e27e4b4b825b8e7f4 Mon Sep 17 00:00:00 2001
From: Hoan Nguyen <hoan.nguyen01@axonactive.com>
Date: Fri, 1 Nov 2024 10:39:30 +0700
Subject: [PATCH 2/2] MARP-1199 DEV instance refers to the config of the ci
 build - make build failed if cannot delete old resources

---
 .github/workflows/docker-build.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 74959138..75b6cdc5 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -37,13 +37,12 @@ jobs:
         run: |
           docker compose -f publish/docker-compose.yml down --rmi all
       - name: Delete old sources code
-        continue-on-error: true
         run: |
           echo "Clean up workspaces ${{ env.BASE_WORKING_DIR }}"
-          rm -rf ./marketplace-ui/*
-          rm -rf ./marketplace-service/*
-          rm -rf ./publish/*
-          rm -rf ./config/*
+          rm -rf ${{ env.BASE_WORKING_DIR }}/marketplace-ui/*
+          rm -rf ${{ env.BASE_WORKING_DIR }}/marketplace-service/*
+          rm -rf ${{ env.BASE_WORKING_DIR }}/publish/*
+          rm -rf ${{ env.BASE_WORKING_DIR }}/config/*
 
   build-and-deploy:
     name: Build and bring up docker containers