From dbf9edfa2bb9bc2835a3394939d79f83b96e4bd6 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Tue, 8 Oct 2024 13:45:07 +0500 Subject: [PATCH 1/4] Update Go version to 1.22.7 and ubi to ubi9 --- Dockerfile | 2 +- Dockerfile.ubi | 2 +- go.mod | 2 +- go.sum | 6 ------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 994cccece..9057f2235 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BUILDER_IMAGE ARG BASE_IMAGE # Build the manager binary -FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.21.12} as builder +FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.22.7} as builder ARG TARGETOS ARG TARGETARCH diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 13562cf6a..07c524473 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -3,7 +3,7 @@ ARG BASE_IMAGE FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE} as SRC -FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi8/ubi:latest} as ubi +FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi9/ubi:latest} as ubi ARG TARGETARCH diff --git a/go.mod b/go.mod index 65de5fb74..d36476c99 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/stakater/Reloader -go 1.21.12 +go 1.22.7 require ( github.com/argoproj/argo-rollouts v1.7.2 diff --git a/go.sum b/go.sum index ce05622fc..936355ac5 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -github.com/argoproj/argo-rollouts v1.7.1 h1:KWStvHPRrNTbDTclogiYC/s4eKbdS45KkgXiorDzKG0= -github.com/argoproj/argo-rollouts v1.7.1/go.mod h1:Te4HrUELxKiBpK8lgk77o4gTa3mv8pXCd8xdPprKrbs= github.com/argoproj/argo-rollouts v1.7.2 h1:faDUH/qePerYRwsrHfVzNQkhjGBgXIiVYdVK8824kMo= github.com/argoproj/argo-rollouts v1.7.2/go.mod h1:Te4HrUELxKiBpK8lgk77o4gTa3mv8pXCd8xdPprKrbs= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= @@ -177,10 +175,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.2 h1:5ctymQzZlyOON1666svgwn3s6IKWgfbjsejTMiXIyjg= -github.com/prometheus/client_golang v1.20.2/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_golang v1.20.3 h1:oPksm4K8B+Vt35tUhw6GbSNSgVlVSBH0qELP/7u83l4= -github.com/prometheus/client_golang v1.20.3/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= From 8db29491d12ebb0a2a6c0061bfb89047531d45a2 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Tue, 8 Oct 2024 14:07:33 +0500 Subject: [PATCH 2/4] Update Go version to 1.23.1 and ubi to ubi9 --- Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9057f2235..795aa2ba0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BUILDER_IMAGE ARG BASE_IMAGE # Build the manager binary -FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.22.7} as builder +FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.23.1} as builder ARG TARGETOS ARG TARGETARCH diff --git a/go.mod b/go.mod index d36476c99..575fc30f1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/stakater/Reloader -go 1.22.7 +go 1.23.1 require ( github.com/argoproj/argo-rollouts v1.7.2 From 715e9bdcde05dc423492fe96ac68eb22b3605a0a Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Tue, 8 Oct 2024 14:31:00 +0500 Subject: [PATCH 3/4] revert change for ubi --- Dockerfile.ubi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 07c524473..13562cf6a 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -3,7 +3,7 @@ ARG BASE_IMAGE FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE} as SRC -FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi9/ubi:latest} as ubi +FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi8/ubi:latest} as ubi ARG TARGETARCH From 31dbb60df7f5dc00df865ce8ded737d5d604aac6 Mon Sep 17 00:00:00 2001 From: MuneebAijaz Date: Tue, 8 Oct 2024 16:16:21 +0500 Subject: [PATCH 4/4] case --- Dockerfile | 2 +- Dockerfile.ubi | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 795aa2ba0..19e6dca3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ ARG BUILDER_IMAGE ARG BASE_IMAGE # Build the manager binary -FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.23.1} as builder +FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE:-golang:1.23.1} AS builder ARG TARGETOS ARG TARGETARCH diff --git a/Dockerfile.ubi b/Dockerfile.ubi index 13562cf6a..f9ccd75b2 100644 --- a/Dockerfile.ubi +++ b/Dockerfile.ubi @@ -1,9 +1,9 @@ ARG BUILDER_IMAGE ARG BASE_IMAGE -FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE} as SRC +FROM --platform=${BUILDPLATFORM} ${BUILDER_IMAGE} AS SRC -FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi8/ubi:latest} as ubi +FROM ${BASE_IMAGE:-registry.access.redhat.com/ubi8/ubi:latest} AS ubi ARG TARGETARCH