Skip to content

Commit

Permalink
Switch to go 1.15
Browse files Browse the repository at this point in the history
Signed-off-by: Anatolii Bazko <[email protected]>
  • Loading branch information
tolusha committed May 31, 2021
1 parent 4924517 commit 9356ef5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions build/dockerfiles/rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@
# Red Hat, Inc. - initial API and implementation
#

# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/go-toolset
FROM registry.access.redhat.com/ubi8/go-toolset:1.14.12-17.1618436992 as builder
ENV GOPATH=/go/
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.4 as builder
# shadow-utils is needed to install `adduser` tool
RUN microdnf install -y golang shadow-utils && \
go version

USER root
WORKDIR /che-machine-exec/
COPY . .
Expand All @@ -24,7 +27,7 @@ RUN adduser unprivilegeduser && \
CGO_ENABLED=0 GOOS=linux go build -mod=vendor -a -ldflags '-w -s' -a -installsuffix cgo -o che-machine-exec . && \
mkdir -p /rootfs/tmp /rootfs/etc /rootfs/go/bin && \
# In the `scratch` you can't use Dockerfile#RUN, because there is no shell and no standard commands (mkdir and so on).
# That's why prepare absent `/tmp` folder for scratch image
# That's why prepare absent `/tmp` folder for scratch image
chmod 1777 /rootfs/tmp && \
cp -rf /etc/passwd /rootfs/etc && \
cp -rf /che-machine-exec/che-machine-exec /rootfs/go/bin
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/eclipse-che/che-machine-exec

go 1.14
go 1.15

replace (
cloud.google.com/go => cloud.google.com/go v0.54.0
Expand Down

0 comments on commit 9356ef5

Please sign in to comment.