From 8fa8a9942854c92230072de9f393f38cd9ef2e6f Mon Sep 17 00:00:00 2001 From: Djebran Lezzoum Date: Tue, 17 Oct 2023 15:43:49 +0200 Subject: [PATCH] go-toolset: update to latest container base version. Update Go Toolset for UBI 8 to latest version as per https://catalog.redhathttps://catalog.redhat.com/software/containers/ubi8/go-toolset/5ce8713aac3db925c03774d1?architecture=amd64&image=652d47582fd993af22f76402&container-tabs=overview FIXES: https://issues.redhat.com/browse/THEEDGE-3618 --- Dockerfile | 2 +- build_deploy.sh | 2 +- podman/Containerfile-dev | 2 +- pr_check.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9c4ba5db0..5a4043937 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ############################################ # STEP 1: build executable edge-api binaries ############################################ -FROM registry.access.redhat.com/ubi8/go-toolset:1.19.10-16 AS edge-builder +FROM registry.access.redhat.com/ubi8/go-toolset:1.19.13-2 AS edge-builder WORKDIR $GOPATH/src/github.com/RedHatInsights/edge-api/ COPY . . # Use go mod diff --git a/build_deploy.sh b/build_deploy.sh index daf67ea52..a27bca7c1 100755 --- a/build_deploy.sh +++ b/build_deploy.sh @@ -53,7 +53,7 @@ done # Run coverage using same version of Go as the App podman run --user root --rm -i \ -v $PWD:/usr/src:z \ - registry.access.redhat.com/ubi8/go-toolset:1.19.10-16 \ + registry.access.redhat.com/ubi8/go-toolset:1.19.13-2 \ bash -c 'cd /usr/src && make coverage-no-fdo' # Generate sonarqube reports diff --git a/podman/Containerfile-dev b/podman/Containerfile-dev index 7d0b01b3f..0f5a79eb4 100644 --- a/podman/Containerfile-dev +++ b/podman/Containerfile-dev @@ -1,7 +1,7 @@ ############################################ # STEP 1: build executable edge-api binaries ############################################ -FROM registry.access.redhat.com/ubi8/go-toolset:1.19.10-16 +FROM registry.access.redhat.com/ubi8/go-toolset:1.19.13-2 #WORKDIR $GOPATH/src/github.com/RedHatInsights/edge-api/ COPY . . # Use go mod diff --git a/pr_check.sh b/pr_check.sh index 3474eab68..47f748295 100755 --- a/pr_check.sh +++ b/pr_check.sh @@ -52,7 +52,7 @@ CONTAINER_NAME="edge-pr-check-$ghprbPullId" podman run --user root --rm --replace -i \ --name $CONTAINER_NAME \ -v $PWD:/usr/src:z \ - registry.access.redhat.com/ubi8/go-toolset:1.19.10-16 \ + registry.access.redhat.com/ubi8/go-toolset:1.19.13-2 \ bash -c 'cd /usr/src && make coverage-no-fdo' # Generate sonarqube reports