From d7eb0a870511ae6eb31e290979eb5ec2e6e80b45 Mon Sep 17 00:00:00 2001
From: Vikas Nale <vikas@marcoaiot.com>
Date: Fri, 19 Sep 2025 13:10:37 +0530
Subject: [PATCH] dynamic branch and image details for release script

---
 prod/config.env        | 16 ++++++++++++----
 prod/publish-api.sh    |  4 ++--
 prod/publish-client.sh |  4 ++--
 prod/pull-api.sh       | 20 +++++++++++++++++---
 prod/pull-client.sh    |  4 ++--
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/prod/config.env b/prod/config.env
index b1a1a58..fc3e044 100644
--- a/prod/config.env
+++ b/prod/config.env
@@ -1,9 +1,17 @@
 # config.env
 ENVIRONMENT=production
-WEB_BRANCH_NAME=Issue_May_2W
-WEB_IMAGE_NAME=marco.web.prod:v1.1
+WEB_BRANCH_NAME=react-query-v2
+WEB_IMAGE_NAME=marco.web.prod:v3.13
 WEB_CONTAINER_NAME=marco.web.prod
-API_BRANCH_NAME=Issues_May_2W
-API_IMAGE_NAME=marco.api.prod:v1.1
+WEB_PORT=4175
+WEB_REPO_DIR=marco.pms.web
+WEB_REPO=https://git.marcoaiot.com/admin/marco.pms.web.git
+API_BRANCH_NAME=Ashutosh_Refactor
+API_IMAGE_NAME=marco.api.prod:v3.13.1
 API_CONTAINER_NAME=marco.api.prod
+API_PORT1=8085
+API_PORT2=8086
+API_REPO_DIR=marco.pms.api
+API_REPO=https://git.marcoaiot.com/admin/marco.pms.api.git
 API_URL=https://api.marcoaiot.com
+
diff --git a/prod/publish-api.sh b/prod/publish-api.sh
index 18317b6..8296faa 100644
--- a/prod/publish-api.sh
+++ b/prod/publish-api.sh
@@ -6,7 +6,7 @@ source ./config.env
 # Step 1: set branch Name
 IMAGE_NAME=$API_IMAGE_NAME
 CONTAINER_NAME=$API_CONTAINER_NAME
-REPO_DIR="marco.pms.api"
+REPO_DIR=$API_REPO_DIR
 
 # Navigate into the project directory
 
@@ -46,7 +46,7 @@ fi
 # Step 5: Run the Docker containerer
 echo "Running Docker container..."
 
-docker run -d --name $CONTAINER_NAME --network mynetwork -p 8085:8080 -p 8086:8081 $IMAGE_NAME
+docker run -d --name $CONTAINER_NAME --network mynetwork -p $API_PORT1:8080 -p $API_PORT2:8081 $IMAGE_NAME
 
 # Step 6: Final Message
 echo "Successfully Running $CONTAINER_NAME"
diff --git a/prod/publish-client.sh b/prod/publish-client.sh
index e66e130..cf3cc00 100644
--- a/prod/publish-client.sh
+++ b/prod/publish-client.sh
@@ -7,7 +7,7 @@ source ./config.env
 # Set the name for the Docker image and container
 IMAGE_NAME=$WEB_IMAGE_NAME
 CONTAINER_NAME=$WEB_CONTAINER_NAME
-REPO_DIR="marco.pms.web"
+REPO_DIR=$WEB_REPO_DIR
 VITE_API_URL=$API_URL
 
 
@@ -68,7 +68,7 @@ cd ../
 
 # Step 7: Run the Docker containerer
 echo "------------ Running Docker container..."
-docker run -d --name "$CONTAINER_NAME" -p 4175:4173 \
+docker run -d --name "$CONTAINER_NAME" -p $WEB_PORT:4173 \
 	 -e VITE_API_URL="$VITE_API_URL"  "$IMAGE_NAME"
 
 
diff --git a/prod/pull-api.sh b/prod/pull-api.sh
index af3017e..63600b5 100644
--- a/prod/pull-api.sh
+++ b/prod/pull-api.sh
@@ -3,12 +3,13 @@
 # Load config file
 source ./config.env
 
+
+# Repository URL
+REPO_URL=$API_REPO
+REPO_DIR=$API_REPO_DIR
 #set branch Name
 BRANCH_NAME=$API_BRANCH_NAME
 
-# Repository URL
-REPO_URL="https://git.marcoaiot.com/admin/marco.pms.api.git"
-REPO_DIR="marco.pms.api"
 
 # Step 1: Clone the GitHub repository (use the branch defined)
 if [ -d "$REPO_DIR" ]; then
@@ -27,4 +28,17 @@ else
 
 fi
 
+
 echo "Successfully pull $BRANCH_NAME"
+echo "---------------------------------------------"
+echo "Copying appsetting"
+
+
+cd ..
+SOURCE_FILE="./appsettings.Production.json"
+TARGET_DIR="./marco.pms.api/Marco.Pms.Services/"
+cp "$SOURCE_FILE" "$TARGET_DIR"
+#cp "./appsettings.Production.json" "./marco.pms.api/Marco.Pms.Services/"
+
+echo "Successfully copied appsetting to  $TARGET_DIR"
+
diff --git a/prod/pull-client.sh b/prod/pull-client.sh
index 906bbbb..c5bf479 100644
--- a/prod/pull-client.sh
+++ b/prod/pull-client.sh
@@ -8,8 +8,8 @@ source ./config.env
 BRANCH_NAME=$WEB_BRANCH_NAME
 
 # Repository URL
-REPO_URL="https://git.marcoaiot.com/admin/marco.pms.web.git"
-REPO_DIR="marco.pms.web"
+REPO_URL=$WEB_REPO
+REPO_DIR=$WEB_REPO_DIR
 
 # Step 1: Clone the GitHub repository (use the branch defined)
 if [ -d "$REPO_DIR" ]; then