seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update from downstream (new go-toolset, new ubi8-mini, fix for libnghttp2 

Change-Id: I8175c400023c985e5ba2702e7924ffbcfb769b4b
Signed-off-by: nickboldt <nboldt@redhat.com>
pull/85/head
nickboldt 2019-09-20 16:32:38 -04:00 committed by Nick Boldt
parent 3a28252487
commit 432aef3d1a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -13,7 +13,7 @@
# NOTE: using registry.redhat.io/rhel8/go-toolset requires login, which complicates automation
# NOTE: since updateBaseImages.sh does not support other registries than RHCC, update to RHEL8
# 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.11.6-18 as builder
FROM registry.access.redhat.com/devtools/go-toolset-rhel7:1.11.13-10 as builder
ENV PATH=/opt/rh/go-toolset-1.11/root/usr/bin:$PATH \
GOPATH=/go/
@ -24,7 +24,7 @@ ADD . /go/src/github.com/eclipse/che-operator
RUN cd /go/src/github.com/eclipse/che-operator && export MOCK_API=true && go test -v ./... && OOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o /tmp/che-operator/che-operator /go/src/github.com/eclipse/che-operator/cmd/manager/main.go && cd ..
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
FROM registry.access.redhat.com/ubi8-minimal:8.0-159
FROM registry.access.redhat.com/ubi8-minimal:8.0-213
ENV SUMMARY="Red Hat CodeReady Workspaces Operator container" \
DESCRIPTION="Red Hat CodeReady Workspaces Operator container" \
@ -51,5 +51,5 @@ LABEL summary="$SUMMARY" \
COPY --from=builder /tmp/che-operator/che-operator /usr/local/bin/che-operator
COPY --from=builder /go/src/github.com/eclipse/che-operator/deploy/keycloak_provision /tmp/keycloak_provision
# apply CVE fixes, if required
# RUN microdnf update -y bash vim-minimal pango && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages"
RUN microdnf update -y libnghttp2 && microdnf clean all && rm -rf /var/cache/yum && echo "Installed Packages" && rpm -qa | sort -V && echo "End Of Installed Packages"
CMD ["che-operator"]