fix CI/CD

LiskHQ · Jan 20, 2025 · 90aa14e · 90aa14e
1 parent e6fa1c2
commit 90aa14e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -44,5 +44,19 @@ jobs:
         id: login-ecr
         uses: aws-actions/amazon-ecr-login@62f4f872db3836360b72999f4b87f1ff13310f3a
 
+      - name: Docker image
+        id: docker-image
+        run: |
+          echo "image=${{ steps.login-ecr.outputs.registry }}/${{ secrets.ECR_REPOSITORY }}" >> $GITHUB_OUTPUT
+
       - name: Build docker image
-        run: make jib
+        run: make jib-docker
+
+      - name: Update tags
+        run: |
+          docker tag liskhq/dshackle ${{ steps.docker-image.outputs.image }}:latest
+          docker tag liskhq/dshackle ${{ steps.docker-image.outputs.image }}:${{ github.sha }}
+
+      - name: Push Docker images to Amazon ECR
+        run: |
+          docker push --all-tags ${{ steps.docker-image.outputs.image }}
diff --git a/Makefile b/Makefile
@@ -10,13 +10,13 @@ test: build-foundation
 	./gradlew check
 
 local-docker: Dockerfile
-	docker build -t drpc-dshackle .
+	docker build -t liskhq-dshackle .
 
 jib: build-foundation local-docker
-	./gradlew jib -Pdocker=drpcorg
+	./gradlew jib -Pdocker=liskhq
 
 jib-docker: build-foundation local-docker
-	./gradlew jibDockerBuild -Pdocker=drpcorg
+	./gradlew jibDockerBuild -Pdocker=liskhq
 
 distZip: build-foundation
 	./gradlew disZip

diff --git a/build.gradle b/build.gradle
@@ -160,7 +160,7 @@ application {
 
 jib {
     from {
-        image = 'docker://drpc-dshackle'
+        image = 'docker://liskhq-dshackle'
     }
     to {
         // by default publish as:
-Original file line number
+Diff line change
@@ Expand Up / @@ -160,7 +160,7 @@ application { @@
     jib {
         from {
-            image = 'docker://drpc-dshackle'
+            image = 'docker://liskhq-dshackle'
         }
         to {
             // by default publish as:
@@ Expand Down @@