From 46b5874577a388fba15296c63d287700ab55feff Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 21 Nov 2022 15:26:36 -0400 Subject: [PATCH 1/2] chore: CRW-3531 update to golang-1.18/ node 18 (because 1.15 and 10.16 are old news) Change-Id: I671170eaac5bb15d76d0543f295f186b1caaac32 Signed-off-by: Nick Boldt --- build/dockerfiles/Dockerfile | 6 +++--- build/dockerfiles/rhel.Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index a83f621ea..6ef9fd758 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright (c) 2012-2021 Red Hat, Inc. +# Copyright (c) 2012-2022 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/ @@ -12,7 +12,7 @@ # Dockerfile defines che-machine-exec production image eclipse/che-machine-exec-dev # -FROM golang:1.15.0-alpine as go_builder +FROM docker.io/golang:1.18-alpine as go_builder ENV USER=machine-exec ENV UID=12345 @@ -38,7 +38,7 @@ WORKDIR /che-machine-exec/ COPY . . RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags '-w -s' -a -installsuffix cgo -o /go/bin/che-machine-exec . -FROM docker.io/node:10.16-alpine as cloud_shell_builder +FROM docker.io/node:18-alpine as cloud_shell_builder COPY --from=go_builder /che-machine-exec/cloud-shell cloud-shell-src WORKDIR cloud-shell-src RUN yarn && \ diff --git a/build/dockerfiles/rhel.Dockerfile b/build/dockerfiles/rhel.Dockerfile index eade49dc0..777ea9973 100644 --- a/build/dockerfiles/rhel.Dockerfile +++ b/build/dockerfiles/rhel.Dockerfile @@ -1,4 +1,4 @@ -# Copyright (c) 2019-2021 Red Hat, Inc. +# Copyright (c) 2019-2022 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/ From acf13166d8f57f95ac3720297a0329d651dd0691 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 21 Nov 2022 15:33:12 -0400 Subject: [PATCH 2/2] could not compile with node:18-alpine, so for now stick with node:16-alpine Change-Id: Ie33cf70926af95246d448f833316bdd1b169d642 Signed-off-by: Nick Boldt --- build/dockerfiles/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/dockerfiles/Dockerfile b/build/dockerfiles/Dockerfile index 6ef9fd758..559dbb1db 100644 --- a/build/dockerfiles/Dockerfile +++ b/build/dockerfiles/Dockerfile @@ -38,7 +38,8 @@ WORKDIR /che-machine-exec/ COPY . . RUN CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags '-w -s' -a -installsuffix cgo -o /go/bin/che-machine-exec . -FROM docker.io/node:18-alpine as cloud_shell_builder +# NOTE: could not compile with node:18-alpine, so for now stick with node:16-alpine +FROM docker.io/node:16-alpine as cloud_shell_builder COPY --from=go_builder /che-machine-exec/cloud-shell cloud-shell-src WORKDIR cloud-shell-src RUN yarn && \