Skip to content
This repository has been archived by the owner on Jan 20, 2023. It is now read-only.

Commit

Permalink
bump to latest rhel images, alpine 3.12 and go 1.13 (#27)
Browse files Browse the repository at this point in the history 
Change-Id: I9abbaf6fdb33b8280205c20a3bc90b79c6f7aeb5
Signed-off-by: nickboldt <[email protected]>

[base] Update from devtools/go-toolset-rhel7:1.12.12-3.1582636125 to devtools/go-toolset-rhel7:1.13.4-18

Change-Id: I1d9764282c8b5afa791990f4b7b8d3b9a63b5931
Signed-off-by: nickboldt <[email protected]>

[base] Update from rhel8/go-toolset:1.12.8-45 to rhel8/go-toolset:1.13.4-15

Change-Id: I549131e409ac9093875dc6fd47af665057ed5cc5
Signed-off-by: nickboldt <[email protected]>

[base] Update from ubi8-minimal:8.1-409 to ubi8-minimal:8.2-267

Change-Id: I95e960d60889b905ce7b16506a9b98e795d1d890
Signed-off-by: nickboldt <[email protected]>
  • Loading branch information
@nickboldt
nickboldt authored Jun 2, 2020
1 parent 1ff5cc0 commit 49c7223
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions build/dockerfiles/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
# Red Hat, Inc. - initial API and implementation
#

FROM golang:1.12-alpine3.9 as builder
FROM golang:1.13-alpine3.12 as builder
RUN apk add --no-cache ca-certificates
RUN adduser -D -g '' appuser
WORKDIR /go/src/github.com/eclipse/che-jwtproxy/
COPY . /go/src/github.com/eclipse/che-jwtproxy/
RUN CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-w -s' -a -installsuffix cgo -o jwtproxy cmd/jwtproxy/main.go

FROM alpine:3.9
FROM alpine:3.12
USER appuser
COPY --from=builder /etc/passwd /etc/passwd
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
Expand Down
2 changes: 1 addition & 1 deletion build/dockerfiles/rhel.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# UPSTREAM: use devtools/go/-toolset-rhel7 image so we're not required to authenticate with registry.redhat.io
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/devtools/go-toolset-rhel7
FROM registry.access.redhat.com/devtools/go-toolset-rhel7:1.13.4-18 as builder
ENV PATH=/opt/rh/go-toolset-1.12/root/usr/bin:$PATH
ENV PATH=/opt/rh/go-toolset-1.13/root/usr/bin:$PATH
# DOWNSTREAM: use rhel8/go-toolset; no path modification needed
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhel8/go-toolset
# FROM registry.redhat.io/rhel8/go-toolset:1.13.4-15 as builder
Expand Down

0 comments on commit 49c7223

Please sign in to comment.