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

Revert "switch to registry.redhat.io/rhel8/go-toolset:1.11.5-8 as builder" so that upstream operator tests can use non-auth'd registry 

This reverts commit 42600e5ffa.

Change-Id: I1ceffe55f0423b0d9a38f14b69fd5fac5bc33c06
pull/26/head
nickboldt 2019-05-14 10:21:32 -04:00
parent 25ef5ddb5c
commit 5d6b75ff13
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Dockerfile
View File

@ -9,8 +9,11 @@
# Red Hat, Inc. - initial API and implementation
#
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhel8/go-toolset
FROM registry.redhat.io/rhel8/go-toolset:1.11.5-8 as builder
# NOTE: using registry.access.redhat.com/rhel8/go-toolset does not work (user is requested to use registry.redhat.io)
# 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.5-3.1553822355 as builder
ENV PATH=/opt/rh/go-toolset-1.11/root/usr/bin:$PATH \
GOPATH=/go/

4
e2e/run-okd-tests.sh
View File

@ -65,8 +65,8 @@ docker run -t \
cp ${OPERATOR_REPO}/tmp/run-tests ${OPERATOR_REPO}/run-tests
echo "[INFO] Pull operator docker image..."
cd ${OPERATOR_REPO} && docker pull quay.io/crw/operator-rhel8:latest
echo "[INFO] Build operator docker image..."
cd ${OPERATOR_REPO} && docker build -t che/operator -f Dockerfile .
echo "[INFO] Run tests..."
cd ${OPERATOR_REPO} && ./run-tests