From 235056c5724e22e4149c2ac8de516792fef3298e Mon Sep 17 00:00:00 2001 From: insumity Date: Fri, 22 Dec 2023 14:53:57 +0100 Subject: [PATCH 1/5] fix dockerfile FROM statement --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 665aa3d84f..12974fa634 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,7 +29,7 @@ RUN go mod tidy RUN make install # Get Hermes build -FROM otacrew/hermes-ics:evidence-cmd AS hermes-builder +FROM --platform=linux/amd64 otacrew/hermes-ics:evidence-cmd AS hermes-builder # Get CometMock FROM ghcr.io/informalsystems/cometmock:v0.37.x as cometmock-builder From 0cd5907bf5f330c37034332dc093c3cd934c0503 Mon Sep 17 00:00:00 2001 From: insumity Date: Fri, 22 Dec 2023 15:24:35 +0100 Subject: [PATCH 2/5] add Dockerfile as a trigger for e2e tests --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1c6bef0518..046a8e19be 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -192,6 +192,7 @@ jobs: **/go.sum **/Makefile Makefile + Dockerfile - name: e2e tests if: env.GIT_DIFF run: | @@ -222,6 +223,7 @@ jobs: **/go.sum **/Makefile Makefile + Dockerfile - name: cometmock tests if: env.GIT_DIFF run: | @@ -252,6 +254,7 @@ jobs: **/go.sum **/Makefile Makefile + Dockerfile - name: trace-e2e tests if: env.GIT_DIFF run: | From 4173c5ce71861085c06184548ff9954858b47d33 Mon Sep 17 00:00:00 2001 From: insumity Date: Fri, 22 Dec 2023 16:03:41 +0100 Subject: [PATCH 3/5] add add Dockerfile.gaia as a trigger for tests --- .github/workflows/test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 046a8e19be..e53948c1fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -193,6 +193,7 @@ jobs: **/Makefile Makefile Dockerfile + Dockerfile.gaia - name: e2e tests if: env.GIT_DIFF run: | @@ -224,6 +225,7 @@ jobs: **/Makefile Makefile Dockerfile + Dockerfile.gaia - name: cometmock tests if: env.GIT_DIFF run: | @@ -255,6 +257,7 @@ jobs: **/Makefile Makefile Dockerfile + Dockerfile.gaia - name: trace-e2e tests if: env.GIT_DIFF run: | From 1ee5ed59004809bd89a2f724d61f37a1cdf89009 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Fri, 22 Dec 2023 16:37:49 +0100 Subject: [PATCH 4/5] Add FROM specifier to Dockerfile.gaia --- Dockerfile.gaia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.gaia b/Dockerfile.gaia index 40dbd98da7..4206fbf36b 100644 --- a/Dockerfile.gaia +++ b/Dockerfile.gaia @@ -61,7 +61,7 @@ WORKDIR /interchain-security RUN make install # Get Hermes build -FROM ghcr.io/informalsystems/hermes:1.4.1 AS hermes-builder +FROM --platform=linux/amd64 ghcr.io/informalsystems/hermes:1.4.1 AS hermes-builder FROM --platform=linux/amd64 fedora:36 RUN dnf update -y From f3ab4ad38dce1b3bdb11c5e7fb3632c4bedb7505 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Tue, 9 Jan 2024 16:30:13 +0100 Subject: [PATCH 5/5] Use wildcard for git diff Dockerfile* --- .github/workflows/test.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e53948c1fc..5e36da2a59 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -192,8 +192,7 @@ jobs: **/go.sum **/Makefile Makefile - Dockerfile - Dockerfile.gaia + Dockerfile* - name: e2e tests if: env.GIT_DIFF run: | @@ -224,8 +223,7 @@ jobs: **/go.sum **/Makefile Makefile - Dockerfile - Dockerfile.gaia + Dockerfile* - name: cometmock tests if: env.GIT_DIFF run: | @@ -256,8 +254,7 @@ jobs: **/go.sum **/Makefile Makefile - Dockerfile - Dockerfile.gaia + Dockerfile* - name: trace-e2e tests if: env.GIT_DIFF run: |