From 7b66a6f6a570ea7320bf7fdf2630f95198f196b3 Mon Sep 17 00:00:00 2001 From: Sunny Aggrawal Date: Fri, 31 Jul 2026 13:06:56 +0530 Subject: [PATCH 1/3] chore: upgrade Go to 1.25 - Bump go directive in go.mod from 1.19 to 1.25 - go mod tidy blocked by pre-existing codegen breakage (missing generated mocks/proto/statik packages that also fail on clean checkout) - Update golang base images to c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22: - build/docker/Dockerfile (was golang:1.19.0-alpine3.16, 2 stages) - tests/mocksubscriber/docker/Dockerfile (was golang:1.16.5-alpine3.13) - Update CI container images in .github/workflows: - build.yml (2 occurrences, was golang:1.16.5-alpine3.13) - review_ci.yml (was golang:1.16.5-alpine3.13) --- .github/workflows/build.yml | 2 +- .github/workflows/review_ci.yml | 2 +- build/docker/Dockerfile | 4 ++-- go.mod | 2 +- tests/mocksubscriber/docker/Dockerfile | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fdeb57f..f22ad3d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: echo "Don't cancel old workflow" tests: runs-on: ubuntu-latest - container: golang:1.16.5-alpine3.13 + container: c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 continue-on-error: false name: Unit tests needs: [cancel] diff --git a/.github/workflows/review_ci.yml b/.github/workflows/review_ci.yml index 1d437221..0bebeeff 100644 --- a/.github/workflows/review_ci.yml +++ b/.github/workflows/review_ci.yml @@ -10,7 +10,7 @@ jobs: reviewdog: name: Run reviewdog runs-on: ubuntu-latest - container: golang:1.16.5-alpine3.13 + container: c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 steps: - name: checkout id: checkout diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index d35e0fce..96948f4e 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -1,6 +1,6 @@ # Stage 1 - Generate proto ########################### -FROM golang:1.19.0-alpine3.16 as proto-builder +FROM c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 as proto-builder ENV CGO_ENABLED 1 ENV METRO_APPENV=${APP_ENV} @@ -27,7 +27,7 @@ RUN make proto-generate # Stage 2 - Compilation build stage ###################################### -FROM golang:1.19.0-alpine3.16 as builder +FROM c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 as builder ENV CGO_ENABLED 1 ENV METRO_APPENV=${APP_ENV} diff --git a/go.mod b/go.mod index 3629df7a..e4873949 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/razorpay/metro -go 1.19 +go 1.25 require ( cloud.google.com/go/pubsub v1.11.0 diff --git a/tests/mocksubscriber/docker/Dockerfile b/tests/mocksubscriber/docker/Dockerfile index c31c1261..95eac5f1 100644 --- a/tests/mocksubscriber/docker/Dockerfile +++ b/tests/mocksubscriber/docker/Dockerfile @@ -1,5 +1,5 @@ #build stage -FROM golang:1.16.5-alpine3.13 as builder +FROM c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 as builder ENV CGO_ENABLED 1 ARG GIT_COMMIT_HASH From 4bbfe52fec1d32e0b12572fef308be0573ea9f17 Mon Sep 17 00:00:00 2001 From: Sunny Aggrawal Date: Mon, 3 Aug 2026 19:09:21 +0530 Subject: [PATCH 2/3] fix: use public golang image (public repo cannot access c.rzp.io) --- .github/workflows/build.yml | 2 +- .github/workflows/review_ci.yml | 2 +- build/docker/Dockerfile | 4 ++-- tests/mocksubscriber/docker/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f22ad3d4..bf060073 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: echo "Don't cancel old workflow" tests: runs-on: ubuntu-latest - container: c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 + container: golang:1.25-alpine3.22 continue-on-error: false name: Unit tests needs: [cancel] diff --git a/.github/workflows/review_ci.yml b/.github/workflows/review_ci.yml index 0bebeeff..70075a65 100644 --- a/.github/workflows/review_ci.yml +++ b/.github/workflows/review_ci.yml @@ -10,7 +10,7 @@ jobs: reviewdog: name: Run reviewdog runs-on: ubuntu-latest - container: c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 + container: golang:1.25-alpine3.22 steps: - name: checkout id: checkout diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 96948f4e..9cfa1ea4 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -1,6 +1,6 @@ # Stage 1 - Generate proto ########################### -FROM c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 as proto-builder +FROM golang:1.25-alpine3.22 as proto-builder ENV CGO_ENABLED 1 ENV METRO_APPENV=${APP_ENV} @@ -27,7 +27,7 @@ RUN make proto-generate # Stage 2 - Compilation build stage ###################################### -FROM c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 as builder +FROM golang:1.25-alpine3.22 as builder ENV CGO_ENABLED 1 ENV METRO_APPENV=${APP_ENV} diff --git a/tests/mocksubscriber/docker/Dockerfile b/tests/mocksubscriber/docker/Dockerfile index 95eac5f1..6ccbb5f1 100644 --- a/tests/mocksubscriber/docker/Dockerfile +++ b/tests/mocksubscriber/docker/Dockerfile @@ -1,5 +1,5 @@ #build stage -FROM c.rzp.io/razorpay/rzp-docker-image-inventory-multi-arch:rzp-golden-image-base-golang-1.25-alpine3.22 as builder +FROM golang:1.25-alpine3.22 as builder ENV CGO_ENABLED 1 ARG GIT_COMMIT_HASH From ae75b432d810fbe34ac8244d2013780bea94c587 Mon Sep 17 00:00:00 2001 From: Sunny Aggrawal Date: Mon, 3 Aug 2026 19:16:45 +0530 Subject: [PATCH 3/3] fix: match runtime alpine version to builder (3.16/3.13 -> 3.22) --- build/docker/Dockerfile | 2 +- tests/mocksubscriber/docker/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 9cfa1ea4..639875db 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -59,7 +59,7 @@ RUN make go-build-metro # Stage 3 - Binary build stage ###################################### -FROM alpine:3.16 +FROM alpine:3.22 COPY --from=builder /src/bin/metro /app/ COPY --from=builder /src/config/ /app/config/ diff --git a/tests/mocksubscriber/docker/Dockerfile b/tests/mocksubscriber/docker/Dockerfile index 6ccbb5f1..dfb5a41b 100644 --- a/tests/mocksubscriber/docker/Dockerfile +++ b/tests/mocksubscriber/docker/Dockerfile @@ -13,7 +13,7 @@ WORKDIR $SRC_DIR RUN go build -o mock-server tests/mocksubscriber/cmd/main.go # final stage -FROM alpine:3.13 +FROM alpine:3.22 COPY --from=builder /src/mock-server /app/ COPY ./tests/mocksubscriber/docker/entrypoint.sh /app/