From ccb7583ffe7a0b3bcaa5efc4dff5e60c10be43f4 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 25 Jan 2023 12:06:49 +0000 Subject: [PATCH 1/3] chore: adding dockerfile for 4.3.x --- Dockerfile | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a193f54906e..2b0296ca7a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,21 @@ -FROM golang:1.18 as builder +FROM golang:1.19 as builder + +ARG IBC_GO_VERSION ENV GOPATH="" ENV GOMODULE="on" +# ensure the ibc go and cosmos sdk versions are being specified for this image. +RUN test -n "${IBC_GO_VERSION}" + COPY go.mod . COPY go.sum . RUN go mod download -ADD testing testing -ADD modules modules -ADD LICENSE LICENSE +COPY testing testing +COPY modules modules +COPY LICENSE LICENSE COPY Makefile . @@ -18,6 +23,10 @@ RUN make build FROM ubuntu:20.04 +ARG IBC_GO_VERSION + +LABEL "org.cosmos.ibc-go" "${IBC_GO_VERSION}" + COPY --from=builder /go/build/simd /bin/simd ENTRYPOINT ["simd"] From 49e2f75a585f2e208fc0c6257e23870bcf1f02ee Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 25 Jan 2023 12:07:51 +0000 Subject: [PATCH 2/3] chore: updating comment in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2b0296ca7a9..d666bc01079 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ARG IBC_GO_VERSION ENV GOPATH="" ENV GOMODULE="on" -# ensure the ibc go and cosmos sdk versions are being specified for this image. +# ensure the ibc go version is being specified for this image. RUN test -n "${IBC_GO_VERSION}" COPY go.mod . From b776a1ae77317a8ff3c89629ec34167f0d7bc2f0 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 25 Jan 2023 12:44:19 +0000 Subject: [PATCH 3/3] chore: add build argument when building the release image --- .github/workflows/release.yml | 3 ++- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cb453590607..f31262fe19c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,4 +51,5 @@ jobs: context: . push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + build-args: | + IBC_GO_VERSION="${{ github.ref_name }}" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c915db779cd..2a433d212f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -56,7 +56,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Docker Build - run: docker build . --no-cache + run: docker build . --no-cache --build-arg IBC_GO_VERSION=v4.3.0 split-test-files: runs-on: ubuntu-latest