Switch to new ECR (#287)

Author: bartoszjedrzejewski

.github/actions/shielder-relayer/build-and-push/action.yml

@@ -6,8 +6,11 @@ inputs:
     required: true
   aws-mainnet-ecr-access-key-id:
     required: true
-  ecr-private-host:
-    description: ECR private host
+  ecr-host:
+    description: ECR host
+    required: true
+  ecr-registry:
+    description: ECR registry
     required: true
 
 outputs:
@@ -26,7 +29,7 @@ runs:
       id: login-private-ecr
       uses: docker/login-action@v2
       with:
-        registry: ${{ inputs.ecr-private-host }}
+        registry: ${{ inputs.ecr-host }}
         username: ${{ inputs.aws-mainnet-ecr-access-key-id }}
         password: ${{ inputs.aws-mainnet-ecr-access-key }}
       env:
@@ -46,7 +49,7 @@ runs:
         builder: ${{ steps.buildx.outputs.name }}
         file: ./crates/shielder-relayer/docker/Dockerfile.client
         push: true
-        tags: "${{ inputs.ecr-private-host }}/shielder-relayer:\
+        tags: "${{ inputs.ecr-registry }}shielder-relayer:\
           ${{ steps.get-ref-properties.outputs.sha }}"
 
     - name: OUTPUTS | Set output with docker image

.github/actions/shielder-relayer/deploy/action.yml

@@ -14,20 +14,12 @@ inputs:
   github-token:
     description: Github token
     required: true
-  ecr-private-host:
-    description: ECR private host
-    required: true
-  kustomize-version:
-    description: Kustomize version
-    required: true
   environment:
     description: Environment to deploy to
     type: choice
     options:
       - all
-      - dev
       - stage
-      - prod
     required: true
 
 runs:
@@ -36,36 +28,22 @@ runs:
     - name: GIT | Checkout aleph-apps repo
       uses: actions/checkout@v4
       with:
-        repository: Cardinal-Cryptography/aleph-apps
+        repository: Cardinal-Cryptography/blanksquare-apps
         token: ${{ inputs.github-token }}
-        path: "aleph-apps"
+        path: "blanksquare-apps"
         ref: main
 
     - name: Setup yq
       uses: dcarbone/install-yq-action@v1.3.1
       with:
         version: "v4.44.3"
 
-    - name: Update docker image tag (dev)
-      if: ${{ inputs.environment == 'dev' || inputs.environment == 'all' }}
-      shell: bash
-      run: |
-        cd aleph-apps/shielder-relayer-v2
-        yq -i '.relayer.image.tag = "${{ inputs.image-tag }}"' dev-values.yaml
-
     - name: Update docker image tag (stage)
       if: ${{ inputs.environment == 'stage' || inputs.environment == 'all' }}
       shell: bash
       run: |
-        cd aleph-apps/shielder-relayer-v2
-        yq -i '.relayer.image.tag = "${{ inputs.image-tag }}"' stage-values.yaml
-
-    - name: Update docker image tag (prod)
-      if: ${{ inputs.environment == 'prod' || inputs.environment == 'all' }}
-      shell: bash
-      run: |
-        cd aleph-apps/shielder-relayer-v2
-        yq -i '.relayer.image.tag = "${{ inputs.image-tag }}"' prod-values.yaml
+        cd blanksquare-apps/shielder-v3/stage
+        yq -i '.shielder-relayer.relayer.image.tag = "${{ inputs.image-tag }}"' values.yaml
 
     - name: GIT | Commit changes to aleph-apps repository
       uses: EndBug/add-and-commit@v9.1.4
@@ -78,4 +56,4 @@ runs:
           Updating shielder-relayer on environment: ${{ inputs.environment }}
           docker image tag: ${{ inputs.image-tag }}
         add: "*.yaml"
-        cwd: 'aleph-apps'
+        cwd: 'blanksquare-apps'

.github/workflows/build-and-deploy-shielder-relayer.yml

@@ -9,9 +9,7 @@ on:
         type: choice
         options:
           - all
-          - dev
           - stage
-          - prod
         required: true
 
 jobs:
@@ -32,9 +30,10 @@ jobs:
         uses: ./.github/actions/shielder-relayer/build-and-push
         id: build_shielder_relayer
         with:
-          aws-mainnet-ecr-access-key-id: ${{ secrets.AWS_MAINNET_ECR_ACCESS_KEY_ID }}
-          aws-mainnet-ecr-access-key: ${{ secrets.AWS_MAINNET_ECR_ACCESS_KEY }}
-          ecr-private-host: ${{ secrets.ECR_PRIVATE_HOST }}
+          aws-mainnet-ecr-access-key-id: ${{ secrets.AWS_MAINNET_ECR_CC_ACCESS_KEY_ID }}
+          aws-mainnet-ecr-access-key: ${{ secrets.AWS_MAINNET_ECR_CC_ACCESS_KEY }}
+          ecr-host: ${{ vars.ECR_PUBLIC_HOST }}
+          ecr-registry: ${{ vars.ECR_CC_RES_PUBLIC_REGISTRY }}
     outputs:
       image_tag: ${{ steps.build_shielder_relayer.outputs.image_tag }}
 
@@ -55,5 +54,3 @@ jobs:
           autocommit-author: ${{ secrets.AUTOCOMMIT_AUTHOR }}
           autocommit-email: ${{ secrets.AUTOCOMMIT_EMAIL }}
           github-token: ${{ secrets.CI_GH_TOKEN }}
-          kustomize-version: ${{ vars.KUSTOMIZE_VERSION }}
-          ecr-private-host: ${{ secrets.ECR_PRIVATE_HOST }}

.github/workflows/build-and-push-fee-estimator.yml

@@ -17,9 +17,9 @@ jobs:
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: ${{ secrets.ECR_PRIVATE_HOST }}
-          username: ${{ secrets.AWS_MAINNET_ECR_ACCESS_KEY_ID }}
-          password: ${{ secrets.AWS_MAINNET_ECR_ACCESS_KEY }}
+          registry: ${{ vars.ECR_PUBLIC_HOST }}
+          username: ${{ secrets.AWS_MAINNET_ECR_CC_ACCESS_KEY_ID }}
+          password: ${{ secrets.AWS_MAINNET_ECR_CC_ACCESS_KEY }}
 
       - name: Call action get-ref-properties
         id: get-ref-properties
@@ -47,4 +47,4 @@ jobs:
           push: true
           # yamllint disable rule:line-length
           tags: |
-             ${{ secrets.ECR_PRIVATE_HOST }}/fee-estimator:${{ steps.get-ref-properties.outputs.sha }}
+             ${{ vars.ECR_CC_RES_PUBLIC_REGISTRY }}fee-estimator:${{ steps.get-ref-properties.outputs.sha }}