From 3dc3d4efda8631e74f2f90a06fda613ed0ec07a7 Mon Sep 17 00:00:00 2001 From: nickboldt Date: Fri, 8 Oct 2021 09:35:41 -0300 Subject: [PATCH 1/3] fix: 20610 - switch to che-golang-1.17 (depends on new arbitrary-users-patch/base_images build) Change-Id: I7f1101af56414186b5604aa091f89e32e51fe142 Signed-off-by: nickboldt --- arbitrary-users-patch/base_images | 3 +-- devfiles/go/devfile.yaml | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arbitrary-users-patch/base_images b/arbitrary-users-patch/base_images index e53e02e83..4480acd6b 100644 --- a/arbitrary-users-patch/base_images +++ b/arbitrary-users-patch/base_images @@ -2,8 +2,7 @@ che-antora-2.3 docker.io/antora/antora:2.3.3 che-cpp-rhel7 registry.access.redhat.com/devtools/llvm-toolset-rhel7 registry.access.redhat.com/devtools/llvm-toolset-rhel7@sha256:2c65fdfb180eefadb615a6a858ff06ce8541860be2b570716e854510a04cd329 che-dotnet-2.2 mcr.microsoft.com/dotnet/core/sdk:2.2-stretch mcr.microsoft.com/dotnet/core/sdk@sha256:db9b38d066fdbdd5ac5ce862076c27e4ae17f2b57cbacd03bdc3b24e06696ae8 che-dotnet-3.1 mcr.microsoft.com/dotnet/core/sdk:3.1.301-buster mcr.microsoft.com/dotnet/core/sdk@sha256:c87fd21bdebb2c2d573ecd703981476e5b8ac6a0e96d134722bb672e1c231fea -che-golang-1.12 docker.io/golang:1.12-stretch docker.io/golang@sha256:8b0f4fee390ca1308ef5c522accad9f7d98a4134fcde1b2cff33df1cbb1b3b97 -che-golang-1.14 docker.io/golang:1.14-stretch docker.io/golang@sha256:a60bc0c6be7e352336044e68db7089d8604864933fcbc0d7cb2285d60b0b2d98 +che-golang-1.17 docker.io/golang:1.17-stretch docker.io/golang@sha256:dd2513467a4f00f108165141bf25bc4f89e3340ca8da8276cd3d0e8707ddaab6 che-java11-gradle docker.io/gradle:6.6.1-jdk11 docker.io/gradle@sha256:c25f15608cd9bee8e290dd5654f9a784bea4505719fdedd0ad7ac640bed0fc50 che-java11-maven docker.io/maven:3.6.3-jdk-11 docker.io/maven@sha256:1d29ccf46ef2a5e64f7de3d79a63f9bcffb4dc56be0ae3daed5ca5542b38aa2d che-java8-maven docker.io/maven:3.6.1-jdk-8 docker.io/maven@sha256:69b40237b342fee9bf996b81110f4dab250a4bc6a2ee52866965101eda066324 diff --git a/devfiles/go/devfile.yaml b/devfiles/go/devfile.yaml index bd2984920..a5e60f587 100644 --- a/devfiles/go/devfile.yaml +++ b/devfiles/go/devfile.yaml @@ -28,7 +28,8 @@ components: - type: dockerimage # this version is used in the plugin - image: quay.io/eclipse/che-golang-1.14:ce0526f + # Built from https://github.com/eclipse-che/che-devfile-registry/tree/main/arbitrary-users-patch/base_images + image: quay.io/eclipse/che-golang-1.17:TODO-SET-TAG-HERE alias: go-cli env: - name: GOPATH From 3b4b4d8416952ff237ec826a47cdc5ff314c3557 Mon Sep 17 00:00:00 2001 From: nickboldt Date: Fri, 8 Oct 2021 10:33:45 -0300 Subject: [PATCH 2/3] add builder for golang-1.17; add TODO to update go/devfile.yaml once 1.17 exists Change-Id: Ia43a2b05c9e50ba5b8450707032691616aac5fdf Signed-off-by: nickboldt --- devfiles/go/devfile.yaml | 4 ++-- dockerfiles/golang-1.17/Dockerfile | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 dockerfiles/golang-1.17/Dockerfile diff --git a/devfiles/go/devfile.yaml b/devfiles/go/devfile.yaml index a5e60f587..236bf8b1e 100644 --- a/devfiles/go/devfile.yaml +++ b/devfiles/go/devfile.yaml @@ -28,8 +28,8 @@ components: - type: dockerimage # this version is used in the plugin - # Built from https://github.com/eclipse-che/che-devfile-registry/tree/main/arbitrary-users-patch/base_images - image: quay.io/eclipse/che-golang-1.17:TODO-SET-TAG-HERE + # TODO 20610 - move to golang-1.17 once it exists + image: quay.io/eclipse/che-golang-1.14:ce0526f alias: go-cli env: - name: GOPATH diff --git a/dockerfiles/golang-1.17/Dockerfile b/dockerfiles/golang-1.17/Dockerfile new file mode 100644 index 000000000..3fd7e2b0c --- /dev/null +++ b/dockerfiles/golang-1.17/Dockerfile @@ -0,0 +1,14 @@ +# +# Copyright (c) 2019-2021 Red Hat, Inc. +# This program and the accompanying materials are made +# available under the terms of the Eclipse Public License 2.0 +# which is available at https://www.eclipse.org/legal/epl-2.0/ +# +# SPDX-License-Identifier: EPL-2.0 +# + +ARG BASE_IMAGE="docker.io/golang:1.17-stretch" + +FROM docker.io/golang@sha256:dd2513467a4f00f108165141bf25bc4f89e3340ca8da8276cd3d0e8707ddaab6 + +#{INCLUDE:../base.dockerfile} From 24fbcc0a1782cbc1499cebbf526f0767d90b72b9 Mon Sep 17 00:00:00 2001 From: nickboldt Date: Fri, 8 Oct 2021 10:36:03 -0300 Subject: [PATCH 3/3] fix copyright date Change-Id: I2ab6f151dace427cb16f8b74b036f10514f33e73 Signed-off-by: nickboldt --- dockerfiles/golang-1.17/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/golang-1.17/Dockerfile b/dockerfiles/golang-1.17/Dockerfile index 3fd7e2b0c..c08a56003 100644 --- a/dockerfiles/golang-1.17/Dockerfile +++ b/dockerfiles/golang-1.17/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2021 Red Hat, Inc. +# Copyright (c) 2021 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/