Merge remote-tracking branch 'origin/main'

.github/workflows/ui-workflow.yml

@@ -7,6 +7,11 @@ on:
         description: "Docker repository address"
         required: true
         type: string
+      GIT_REVISION_ENV_NAME:
+        description: "Env name for setting git revision"
+        required: false
+        type: string
+        default: 'REACT_GIT_REVISION'
       IS_ECR_PUSH_ENABLED:
         description: "Disable pushing to ECR. Default is true."
         required: true
@@ -16,6 +21,11 @@ on:
         required: false
         type: boolean
         default: true
+      IMAGE_TAG_ECR:
+        description: "Select image tag for ECR"
+        required: false
+        type: string
+        default: latest
       NODE_VERSION:
         description: "Node version to setup. Default is 16."
         required: false
@@ -43,12 +53,19 @@ jobs:
           node-version: ${{ inputs.NODE_VERSION }}
           registry-url: 'https://npm.pkg.github.com'
           scope: '@arbinahq'
+        
+      - name: Add envs
+        run: |
+          echo ${{ inputs.GIT_REVISION_ENV_NAME }}=${{ secrets.SECRET_IMAGE_TAG }} >> .env
+          cat .env
           
-      - run: (rm .npmrc || true) && npm install
+      - name: NPM install packages
+        run: (rm .npmrc || true) && npm install
         env:
           NODE_AUTH_TOKEN: ${{ secrets.SECRET_GH_TOKEN_CAN_READ_PACKAGES }}
-          
-      - run: npm run build
+                  
+      - name: NPM build
+        run: npm run build
         if: ${{ inputs.IS_BUILD_ENABLED }}
 
       - name: Login to ECR
@@ -67,11 +84,12 @@ jobs:
           ECR_REPOSITORY: ${{ inputs.ECR_REPOSITORY }}
           IMAGE_TAG: ${{ secrets.SECRET_IMAGE_TAG }}
           BOOT_JAR_NAME: ${{ inputs.BOOT_JAR_NAME }}
+          IMAGE_TAG_ECR: ${{ inputs.IMAGE_TAG_ECR }}
         run: |
           docker build --build-arg=IMAGE_TAG=$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          docker build --build-arg=IMAGE_TAG=$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:latest .
-          docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
+          docker build --build-arg=IMAGE_TAG=$IMAGE_TAG -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_ECR .
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG_ECR
           
       - name: Logout on Arbina ECR
         run: docker logout ${{ secrets.SECRET_ECR_REGISTRY }}