From a57c73e5f468653feda06b318fc3251dc518c853 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Wed, 2 Apr 2025 17:46:01 +0800
Subject: [PATCH 01/19] download d2e connector, customizer and experience files

---
 Dockerfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 8635cac4ec..cd9e7eac17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,10 +9,15 @@ ENV PUPPETEER_SKIP_DOWNLOAD=true
 ### Install toolchain ###
 RUN npm add --location=global pnpm@^9.0.0
 # https://github.com/nodejs/docker-node/blob/main/docs/BestPractices.md#node-gyp-alpine
-RUN apk add --no-cache python3 make g++ rsync
+RUN apk add --no-cache python3 make g++ rsync py3-setuptools git 
 
 COPY . .
 
+RUN git clone --branch v0.0.1-alpha https://github.com/OHDSI/d2e.git /etc/d2e
+COPY /etc/d2e/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
+COPY /etc/d2e/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts
+COPY /etc/d2e/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
+
 ### Install dependencies and build ###
 RUN pnpm i
 
@@ -22,6 +27,7 @@ ENV DEV_FEATURES_ENABLED=${dev_features_enabled}
 
 ARG applicationinsights_connection_string
 ENV APPLICATIONINSIGHTS_CONNECTION_STRING=${applicationinsights_connection_string}
+
 RUN pnpm -r build
 
 ### Add official connectors ###
@@ -36,8 +42,12 @@ RUN NODE_ENV=production pnpm i
 ### Clean up ###
 RUN rm -rf .scripts pnpm-*.yaml packages/cloud
 
+# TODO: to check whether below command is required
+# RUN npx @logto/cli connector link
+
 ###### [STAGE] Seal ######
 FROM node:20-alpine as app
+RUN apk update && apk add openssl>3
 WORKDIR /etc/logto
 COPY --from=builder /etc/logto .
 RUN mkdir -p /etc/logto/packages/cli/alteration-scripts && chmod g+w /etc/logto/packages/cli/alteration-scripts

From 809f4578be47e063130619eed75b6615ae687c85 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Wed, 2 Apr 2025 19:17:22 +0800
Subject: [PATCH 02/19] fixes in docker build

---
 Dockerfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cd9e7eac17..bd7c992f88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,9 @@ RUN apk add --no-cache python3 make g++ rsync py3-setuptools git
 COPY . .
 
 RUN git clone --branch v0.0.1-alpha https://github.com/OHDSI/d2e.git /etc/d2e
-COPY /etc/d2e/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
-COPY /etc/d2e/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts
-COPY /etc/d2e/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
+RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
+RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts
+RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
 
 ### Install dependencies and build ###
 RUN pnpm i
@@ -41,9 +41,7 @@ RUN NODE_ENV=production pnpm i
 
 ### Clean up ###
 RUN rm -rf .scripts pnpm-*.yaml packages/cloud
-
-# TODO: to check whether below command is required
-# RUN npx @logto/cli connector link
+RUN rm -rf /etc/d2e
 
 ###### [STAGE] Seal ######
 FROM node:20-alpine as app

From b91f112922b54a56fe39bee2ff866abed3441250 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Thu, 3 Apr 2025 10:19:17 +0800
Subject: [PATCH 03/19] separate alp-connector build

---
 Dockerfile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bd7c992f88..d89378b4e6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,11 +16,16 @@ COPY . .
 RUN git clone --branch v0.0.1-alpha https://github.com/OHDSI/d2e.git /etc/d2e
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts
-RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
 
 ### Install dependencies and build ###
 RUN pnpm i
 
+RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
+WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
+RUN npm i
+RUN npm run build
+WORKDIR /etc/logto/
+
 ### Set if dev features enabled ###
 ARG dev_features_enabled
 ENV DEV_FEATURES_ENABLED=${dev_features_enabled}

From 1b99655ffbced56669ae9b8824a17aa0fb6351ba Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Thu, 3 Apr 2025 10:30:24 +0800
Subject: [PATCH 04/19] add d2e connector after production build

---
 Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d89378b4e6..d527ab27eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,12 +20,6 @@ RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.
 ### Install dependencies and build ###
 RUN pnpm i
 
-RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
-WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
-RUN npm i
-RUN npm run build
-WORKDIR /etc/logto/
-
 ### Set if dev features enabled ###
 ARG dev_features_enabled
 ENV DEV_FEATURES_ENABLED=${dev_features_enabled}
@@ -44,6 +38,14 @@ RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
 RUN rm -rf node_modules packages/**/node_modules
 RUN NODE_ENV=production pnpm i
 
+# Note: D2E connector build and link
+RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
+WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
+RUN npm i
+RUN npm run build
+WORKDIR /etc/logto/
+RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
+
 ### Clean up ###
 RUN rm -rf .scripts pnpm-*.yaml packages/cloud
 RUN rm -rf /etc/d2e

From 3099e8d03f5a1bdc36d5c3d7a29bf8c779388261 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Fri, 4 Apr 2025 18:22:31 +0800
Subject: [PATCH 05/19] remove copy of jwt-customizer.ts

---
 Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index d527ab27eb..36804a7040 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,6 @@ COPY . .
 
 RUN git clone --branch v0.0.1-alpha https://github.com/OHDSI/d2e.git /etc/d2e
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
-RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts
 
 ### Install dependencies and build ###
 RUN pnpm i

From 4f7e576c9d409cbc5a6811a1f797d76189a51f3c Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Mon, 14 Apr 2025 13:59:50 +0800
Subject: [PATCH 06/19] reset jwt-customizer to original code

---
 packages/core/src/libraries/jwt-customizer.ts | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/packages/core/src/libraries/jwt-customizer.ts b/packages/core/src/libraries/jwt-customizer.ts
index b336bc0783..15eba24b1f 100644
--- a/packages/core/src/libraries/jwt-customizer.ts
+++ b/packages/core/src/libraries/jwt-customizer.ts
@@ -53,31 +53,14 @@ export class JwtCustomizerLibrary {
   // Convert errors to WithTyped client response error to share the error handling logic.
   static async runScriptInLocalVm(data: CustomJwtFetcher) {
     try {
-      const mapId = (data as any).context["user"].primaryEmail;
       const payload: CustomJwtScriptPayload = {
         ...(data.tokenType === LogtoJwtTokenKeyType.AccessToken
-          ? {
-              ...pick(data, 'token', 'context', 'environmentVariables'),
-              extra: {
-                // @ts-ignore
-                thirdPartyToken: globalThis.tokenMap
-                  ? // @ts-ignore
-                    globalThis.tokenMap[mapId]
-                  : undefined,
-                // @ts-ignore
-                thirdPartyRefreshToken: globalThis.refreshTokenMap
-                  ? // @ts-ignore
-                    globalThis.refreshTokenMap[mapId]
-                  : undefined,
-              },
-            }
+          ? pick(data, 'token', 'context', 'environmentVariables')
           : pick(data, 'token', 'environmentVariables')),
         api: apiContext,
       };
-      const result = await runScriptFunctionInLocalVm(data.script, 'getCustomJwtClaims', payload);
 
-      // @ts-ignore
-      delete globalThis.tokenMap[mapId];
+      const result = await runScriptFunctionInLocalVm(data.script, 'getCustomJwtClaims', payload);
 
       // If the `result` is not a record, we cannot merge it to the existing token payload.
       return z.record(z.unknown()).parse(result);
@@ -250,4 +233,4 @@ export class JwtCustomizerLibrary {
       body: deepmerge(customizerScriptsFromDatabase, newCustomizerScripts),
     });
   }
-}
+}
\ No newline at end of file

From 904c879b1102807f09c9053eae2c435cacc20244 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Mon, 14 Apr 2025 14:02:53 +0800
Subject: [PATCH 07/19] copy jwt-customizer from d2e source code

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 36804a7040..d527ab27eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ COPY . .
 
 RUN git clone --branch v0.0.1-alpha https://github.com/OHDSI/d2e.git /etc/d2e
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
+RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts
 
 ### Install dependencies and build ###
 RUN pnpm i

From 0851cea6e849e4352198694cd4153487dadfca46 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 15 Apr 2025 13:52:25 +0800
Subject: [PATCH 08/19] add experience relevant changes to experience-legacy

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index d527ab27eb..dda4eeb2ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,6 +15,7 @@ COPY . .
 
 RUN git clone --branch v0.0.1-alpha https://github.com/OHDSI/d2e.git /etc/d2e
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
+RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience-legacy/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts
 
 ### Install dependencies and build ###

From e17e312e7539f6ea5c55b254126f15944337432f Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 15 Apr 2025 18:34:12 +0800
Subject: [PATCH 09/19] change d2e release tag

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index dda4eeb2ed..695358df61 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN apk add --no-cache python3 make g++ rsync py3-setuptools git
 
 COPY . .
 
-RUN git clone --branch v0.0.1-alpha https://github.com/OHDSI/d2e.git /etc/d2e
+RUN git clone --branch v0.6.0-beta https://github.com/OHDSI/d2e.git /etc/d2e
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience-legacy/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts

From db4dd8ee0b3388fbae391ef0ac0358b43fef8b94 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 15 Apr 2025 19:37:16 +0800
Subject: [PATCH 10/19] reorder alp connector build

---
 Dockerfile | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 695358df61..1f62a55b2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,13 @@ ENV APPLICATIONINSIGHTS_CONNECTION_STRING=${applicationinsights_connection_strin
 
 RUN pnpm -r build
 
+# Note: D2E connector build and link
+RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
+WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
+RUN npm i
+RUN npm run build
+WORKDIR /etc/logto/
+
 ### Add official connectors ###
 ARG additional_connector_args
 ENV ADDITIONAL_CONNECTOR_ARGS=${additional_connector_args}
@@ -39,14 +46,6 @@ RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
 RUN rm -rf node_modules packages/**/node_modules
 RUN NODE_ENV=production pnpm i
 
-# Note: D2E connector build and link
-RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
-WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
-RUN npm i
-RUN npm run build
-WORKDIR /etc/logto/
-RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
-
 ### Clean up ###
 RUN rm -rf .scripts pnpm-*.yaml packages/cloud
 RUN rm -rf /etc/d2e

From 4bbf94a795d9846fdcb40c00b69bdd56778c2009 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 15 Apr 2025 19:51:30 +0800
Subject: [PATCH 11/19] remove pnpm lock file before and try build

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1f62a55b2a..db177c19cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,14 +42,14 @@ ARG additional_connector_args
 ENV ADDITIONAL_CONNECTOR_ARGS=${additional_connector_args}
 RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
 
-### Prune dependencies for production ###
-RUN rm -rf node_modules packages/**/node_modules
-RUN NODE_ENV=production pnpm i
-
 ### Clean up ###
 RUN rm -rf .scripts pnpm-*.yaml packages/cloud
 RUN rm -rf /etc/d2e
 
+### Prune dependencies for production ###
+RUN rm -rf node_modules packages/**/node_modules
+RUN NODE_ENV=production pnpm i
+
 ###### [STAGE] Seal ######
 FROM node:20-alpine as app
 RUN apk update && apk add openssl>3

From b11d860b183ef278081e01457b3a977fc165faa7 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 15 Apr 2025 20:05:18 +0800
Subject: [PATCH 12/19] rm pnpm lock

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index db177c19cd..9ae2e1560b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -43,7 +43,7 @@ ENV ADDITIONAL_CONNECTOR_ARGS=${additional_connector_args}
 RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
 
 ### Clean up ###
-RUN rm -rf .scripts pnpm-*.yaml packages/cloud
+RUN rm -rf .scripts pnpm-lock.yaml packages/cloud
 RUN rm -rf /etc/d2e
 
 ### Prune dependencies for production ###

From cc31aa7054c7b291e28144dc508cc42a5b8ac44e Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 15 Apr 2025 20:42:59 +0800
Subject: [PATCH 13/19] remove custom-jwt in core-kit

---
 packages/toolkit/core-kit/package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/toolkit/core-kit/package.json b/packages/toolkit/core-kit/package.json
index 174f2869b5..01ce0d5d8d 100644
--- a/packages/toolkit/core-kit/package.json
+++ b/packages/toolkit/core-kit/package.json
@@ -17,11 +17,7 @@
       "import": "./lib/index.js"
     },
     "./declaration": "./declaration/index.ts",
-    "./scss/*": "./scss/*.scss",
-    "./custom-jwt": {
-      "node": "./lib/custom-jwt/index.js",
-      "types": "./lib/custom-jwt/index.d.ts"
-    }
+    "./scss/*": "./scss/*.scss"
   },
   "types": "./lib/index.d.ts",
   "files": [

From a86bf863fe59045c5b33cb649732dd758411ca99 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Wed, 16 Apr 2025 10:07:05 +0800
Subject: [PATCH 14/19] revert dockerfile changes

---
 Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9ae2e1560b..931d6f147c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,6 +30,15 @@ ENV APPLICATIONINSIGHTS_CONNECTION_STRING=${applicationinsights_connection_strin
 
 RUN pnpm -r build
 
+### Add official connectors ###
+ARG additional_connector_args
+ENV ADDITIONAL_CONNECTOR_ARGS=${additional_connector_args}
+RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
+
+### Prune dependencies for production ###
+RUN rm -rf node_modules packages/**/node_modules
+RUN NODE_ENV=production pnpm i
+
 # Note: D2E connector build and link
 RUN cp -r /etc/d2e/services/alp-logto/connector-alp-azuread /etc/logto/packages/connectors/connector-alp-azuread
 WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
@@ -37,19 +46,10 @@ RUN npm i
 RUN npm run build
 WORKDIR /etc/logto/
 
-### Add official connectors ###
-ARG additional_connector_args
-ENV ADDITIONAL_CONNECTOR_ARGS=${additional_connector_args}
-RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
-
 ### Clean up ###
-RUN rm -rf .scripts pnpm-lock.yaml packages/cloud
+RUN rm -rf .scripts pnpm-*.yaml packages/cloud
 RUN rm -rf /etc/d2e
 
-### Prune dependencies for production ###
-RUN rm -rf node_modules packages/**/node_modules
-RUN NODE_ENV=production pnpm i
-
 ###### [STAGE] Seal ######
 FROM node:20-alpine as app
 RUN apk update && apk add openssl>3

From 1ef9e7539d16903a6bfeedde6ddd6e2e37238052 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Wed, 16 Apr 2025 10:19:37 +0800
Subject: [PATCH 15/19] add ARG version to dockerfile

---
 .github/workflows/docker-push.yml | 4 +++-
 Dockerfile                        | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index 7971c83a6f..b15c43b105 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -110,4 +110,6 @@ jobs:
           file: ${{ matrix.DOCKER_BUILD_FILE_PATH }}
           platforms: ${{ steps.setup.outputs.DOCKER_BUILD_PLATFORMS }}
           push: ${{ steps.setup.outputs.ACR_IMAGE_PUSH }}
-          tags: ghcr.io/data2evidence/${{ matrix.name }}:${{ env.DOCKER_IMG_TAG_NAME }}
\ No newline at end of file
+          tags: ghcr.io/data2evidence/${{ matrix.name }}:${{ env.DOCKER_IMG_TAG_NAME }}
+          build-args: |
+            VERSION=${{ env.GIT_BRANCH_NAME }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 931d6f147c..226e57b6e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,8 @@ ENV CI=true
 
 # No need for Docker build
 ENV PUPPETEER_SKIP_DOWNLOAD=true
+ARG VERSION=develop
+ENV VERSION=${VERSION}
 
 ### Install toolchain ###
 RUN npm add --location=global pnpm@^9.0.0
@@ -13,7 +15,7 @@ RUN apk add --no-cache python3 make g++ rsync py3-setuptools git
 
 COPY . .
 
-RUN git clone --branch v0.6.0-beta https://github.com/OHDSI/d2e.git /etc/d2e
+RUN git clone --branch ${VERSION} https://github.com/OHDSI/d2e.git /etc/d2e
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience-legacy/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts

From 40f1f4356c0ea00b16cc7ae14b19864caa574dac Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Thu, 17 Apr 2025 09:54:48 +0800
Subject: [PATCH 16/19] rename version to D2E_VERSIOn

---
 .github/workflows/docker-push.yml | 6 +++++-
 Dockerfile                        | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index b15c43b105..93e09136ba 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -19,6 +19,10 @@ on:
         description: Enter BranchName
         required: true
         type: string
+      D2E_BRANCH_NAME:
+        default: develop
+        description: Enter D2E Branch
+        type: string
 
 concurrency:
   group: ${{ github.event.inputs.GIT_BRANCH_NAME || github.head_ref || github.ref_name }}-${{ github.event_name }}-docker-build
@@ -112,4 +116,4 @@ jobs:
           push: ${{ steps.setup.outputs.ACR_IMAGE_PUSH }}
           tags: ghcr.io/data2evidence/${{ matrix.name }}:${{ env.DOCKER_IMG_TAG_NAME }}
           build-args: |
-            VERSION=${{ env.GIT_BRANCH_NAME }}
\ No newline at end of file
+            D2E_VERSION=${{ env.D2E_BRANCH_NAME }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 226e57b6e4..329ec0eb81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,8 +5,8 @@ ENV CI=true
 
 # No need for Docker build
 ENV PUPPETEER_SKIP_DOWNLOAD=true
-ARG VERSION=develop
-ENV VERSION=${VERSION}
+ARG D2E_VERSION=develop
+ENV D2E_VERSION=${D2E_VERSION}
 
 ### Install toolchain ###
 RUN npm add --location=global pnpm@^9.0.0
@@ -15,7 +15,7 @@ RUN apk add --no-cache python3 make g++ rsync py3-setuptools git
 
 COPY . .
 
-RUN git clone --branch ${VERSION} https://github.com/OHDSI/d2e.git /etc/d2e
+RUN git clone --branch ${D2E_VERSION} https://github.com/OHDSI/d2e.git /etc/d2e
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/SignIn/Main.tsx /etc/logto/packages/experience-legacy/src/pages/SignIn/Main.tsx
 RUN cp /etc/d2e/services/alp-logto/to-replace/core/src/libraries/jwt-customizer.ts /etc/logto/packages/core/src/libraries/jwt-customizer.ts

From cb01c552213b8f9a8cbc3d4ee5b088c08a204097 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Mon, 21 Apr 2025 12:05:23 +0800
Subject: [PATCH 17/19] add missing link connector

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index 329ec0eb81..68f38ff29d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,6 +47,7 @@ WORKDIR /etc/logto/packages/connectors/connector-alp-azuread
 RUN npm i
 RUN npm run build
 WORKDIR /etc/logto/
+RUN pnpm cli connector link $ADDITIONAL_CONNECTOR_ARGS -p .
 
 ### Clean up ###
 RUN rm -rf .scripts pnpm-*.yaml packages/cloud

From c94b609f21ed9b52aeaa7bf69df54441c1d72b30 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 22 Apr 2025 12:50:55 +0800
Subject: [PATCH 18/19] add default build args

---
 .github/workflows/docker-push.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index 93e09136ba..768594b6ef 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -116,4 +116,4 @@ jobs:
           push: ${{ steps.setup.outputs.ACR_IMAGE_PUSH }}
           tags: ghcr.io/data2evidence/${{ matrix.name }}:${{ env.DOCKER_IMG_TAG_NAME }}
           build-args: |
-            D2E_VERSION=${{ env.D2E_BRANCH_NAME }}
\ No newline at end of file
+            D2E_VERSION=${{ env.D2E_BRANCH_NAME || 'develop' }}
\ No newline at end of file

From 6987a9db5578533d3dd2a8f603b6c7fef24fb9a9 Mon Sep 17 00:00:00 2001
From: santan maddi <saisantan2004@gmail.com>
Date: Tue, 22 Apr 2025 13:04:37 +0800
Subject: [PATCH 19/19] refactor docker tag name and push

---
 .github/workflows/docker-push.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index 768594b6ef..103d02aeaf 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -70,14 +70,16 @@ jobs:
         id: setup
         run: |
           ACR_IMAGE_PUSH=true
-          if [ $GIT_BRANCH_NAME = 'develop' ]; then
-            ACR_IMAGE_PUSH=true
-          fi
-
           if [ $GIT_BRANCH_NAME == "develop" ]; then
-            DOCKER_IMG_TAG_NAME=develop 
+            DOCKER_IMG_TAG_NAME=develop
+          elif [ $GITHUB_EVENT_NAME = "workflow_dispatch" ]; then
+            DOCKER_IMG_TAG_NAME=${{ github.event.inputs.GIT_BRANCH_NAME }}
+            if [[ $GIT_BRANCH_NAME = */* ]]; then
+              DOCKER_IMG_TAG_NAME=$(printf "%s" "$GIT_BRANCH_NAME" | awk -F '/' '{print $2}')
+            fi 
           else
-            DOCKER_IMG_TAG_NAME=$(echo $(git rev-parse --short HEAD))
+            ACR_IMAGE_PUSH=false
+            DOCKER_IMG_TAG_NAME=$(echo ${{ github.sha }} | cut -c1-8)
           fi
 
           echo GIT_BRANCH_NAME="${GIT_BRANCH_NAME}" | tee -a $GITHUB_OUTPUT | tee -a $GITHUB_STEP_SUMMARY