From 7e32f2acd512b3003c270f6bdafdae456f9188ab Mon Sep 17 00:00:00 2001 From: yahavi Date: Sun, 18 Jun 2023 10:50:02 +0300 Subject: [PATCH 1/2] Update Go to 1.20.5 --- Jenkinsfile | 2 +- build/docker/full/Dockerfile | 2 +- build/docker/slim/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b06ee2698..ec5c772ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ node("docker") { repo = 'jfrog-cli' sh 'rm -rf temp' sh 'mkdir temp' - def goRoot = tool 'go-1.20.4' + def goRoot = tool 'go-1.20.5' env.GOROOT="$goRoot" env.PATH+=":${goRoot}/bin" env.GO111MODULE="on" diff --git a/build/docker/full/Dockerfile b/build/docker/full/Dockerfile index 76e3f5c69..7d3a5f645 100644 --- a/build/docker/full/Dockerfile +++ b/build/docker/full/Dockerfile @@ -1,6 +1,6 @@ ARG repo_name_21 # Remove ${repo_name_21} to pull from Docker Hub. -FROM ${repo_name_21}/jfrog-docker/golang:1.20.4 as builder +FROM ${repo_name_21}/jfrog-docker/golang:1.20.5 as builder ARG image_name=jfrog-cli-full ARG cli_executable_name WORKDIR /${image_name} diff --git a/build/docker/slim/Dockerfile b/build/docker/slim/Dockerfile index b9d93b469..c150f0d7a 100644 --- a/build/docker/slim/Dockerfile +++ b/build/docker/slim/Dockerfile @@ -1,6 +1,6 @@ ARG repo_name_21 # Remove ${repo_name_21} to pull from Docker Hub. -FROM ${repo_name_21}/jfrog-docker/golang:1.20.4-alpine as builder +FROM ${repo_name_21}/jfrog-docker/golang:1.20.5-alpine as builder ARG image_name=jfrog-cli ARG cli_executable_name WORKDIR /${image_name} From 6b8bb4ae98beaf5943f1f15e55bf18bfee59015c Mon Sep 17 00:00:00 2001 From: yahavi Date: Sun, 18 Jun 2023 11:04:07 +0300 Subject: [PATCH 2/2] Use the latest patch version --- build/docker/full/Dockerfile | 2 +- build/docker/slim/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/docker/full/Dockerfile b/build/docker/full/Dockerfile index 7d3a5f645..6198ce57b 100644 --- a/build/docker/full/Dockerfile +++ b/build/docker/full/Dockerfile @@ -1,6 +1,6 @@ ARG repo_name_21 # Remove ${repo_name_21} to pull from Docker Hub. -FROM ${repo_name_21}/jfrog-docker/golang:1.20.5 as builder +FROM ${repo_name_21}/jfrog-docker/golang:1.20 as builder ARG image_name=jfrog-cli-full ARG cli_executable_name WORKDIR /${image_name} diff --git a/build/docker/slim/Dockerfile b/build/docker/slim/Dockerfile index c150f0d7a..ae69bd4c7 100644 --- a/build/docker/slim/Dockerfile +++ b/build/docker/slim/Dockerfile @@ -1,6 +1,6 @@ ARG repo_name_21 # Remove ${repo_name_21} to pull from Docker Hub. -FROM ${repo_name_21}/jfrog-docker/golang:1.20.5-alpine as builder +FROM ${repo_name_21}/jfrog-docker/golang:1.20-alpine as builder ARG image_name=jfrog-cli ARG cli_executable_name WORKDIR /${image_name}