Skip to content

Commit

Permalink
feat: CRW-4582 switch to ubi8 minimal downstream w/ openssl installed (
Browse files Browse the repository at this point in the history
…#261)

Change-Id: I4ce761b33179e04250efc1e3c71b9cbc7fe2e09a

Signed-off-by: Nick Boldt <[email protected]>
  • Loading branch information
nickboldt committed Jul 20, 2023
1 parent a3a0d01 commit 77d8392
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 3 additions & 2 deletions build/dockerfiles/brew.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
FROM rhel8/go-toolset:1.18.10-1 as builder
ENV GOPATH=/go/ \
CGO_ENABLED=1

USER root
WORKDIR /che-machine-exec/
COPY . .
Expand All @@ -27,8 +26,10 @@ RUN adduser unprivilegeduser && \
cp -rf /etc/passwd /rootfs/etc && \
cp -rf /che-machine-exec/che-machine-exec /rootfs/go/bin

FROM scratch
# https://registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.8-1014 as runtime
COPY --from=builder /rootfs /
RUN microdnf install -y openssl; microdnf clean -y all
USER unprivilegeduser
ENTRYPOINT ["/go/bin/che-machine-exec"]

Expand Down
4 changes: 3 additions & 1 deletion build/dockerfiles/rhel.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ RUN adduser unprivilegeduser && \
cp -rf /etc/passwd /rootfs/etc && \
cp -rf /che-machine-exec/che-machine-exec /rootfs/go/bin

FROM scratch
# https://registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.8-1014 as runtime
COPY --from=builder /rootfs /
RUN microdnf install -y openssl; microdnf clean -y all
USER unprivilegeduser
ENTRYPOINT ["/go/bin/che-machine-exec"]

Expand Down

0 comments on commit 77d8392

Please sign in to comment.