add suggestions from @mikenairn

Author: hubeadmin

openshift-ci/Dockerfile.tools

@@ -1,45 +1,9 @@
 FROM registry.svc.ci.openshift.org/openshift/release:golang-1.13
+LABEL maintainer="pbraun@redhat.com"
 
 ENV OPERATOR_SDK_VERSION=v0.18.2 \
-    DELOREAN_VERSION=master \
     GOFLAGS=""
-
-RUN set -o pipefail && \
-    INSTALL_PKGS="skopeo rsync" && \
-    yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS
-
-# install delorean (from git with no history and only the tag)
-# Note: Change to using pre-built binary when it's available https://issues.redhat.com/browse/DEL-288
-RUN mkdir -p $GOPATH/src/github.com/delorean \
-    && cd $GOPATH/src/github.com/delorean \
-    && git clone --depth 1 -b $DELOREAN_VERSION https://github.com/integr8ly/delorean \
-    && cd delorean \
-    && make build/cli \
-    && cp delorean /usr/local/bin
-
-# install operator-sdk (from git with no history and only the tag)
-RUN mkdir -p $GOPATH/src/github.com/operator-framework \
-    && cd $GOPATH/src/github.com/operator-framework \
-    && git clone --depth 1 -b $OPERATOR_SDK_VERSION https://github.com/operator-framework/operator-sdk \
-    && cd operator-sdk \
-    && go mod vendor \
-    && make tidy \
-    && make install \
-    && chmod -R 0777 $GOPATH \
-    && rm -rf $GOPATH/.cache
-
-# install jq and yq
-RUN wget -O jq https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 \
-    && chmod +x ./jq \
-    && cp jq /usr/bin \
-    && curl -Lo /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/3.1.2/yq_linux_amd64 \
-    && chmod +x /usr/local/bin/yq
-
-# install nodejs
-ENV NODE_VERSION=12.16.3 \
-    NPM_CONFIG_CACHE=/tmp/.npm
-
-RUN curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
-    && tar -xJf "node-v$NODE_VERSION-linux-x64.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \
-    && rm "node-v$NODE_VERSION-linux-x64.tar.xz" \
-    && ln -s /usr/local/bin/node /usr/local/bin/nodejs
+# install operator-sdk
+RUN curl -LO https://github.com/operator-framework/operator-sdk/releases/download/${OPERATOR_SDK_VERSION}/operator-sdk-${OPERATOR_SDK_VERSION}-x86_64-linux-gnu && \
+    mv operator-sdk-${OPERATOR_SDK_VERSION}-x86_64-linux-gnu /usr/bin/operator-sdk && \
+    chmod +x /usr/bin/operator-sdk

openshift-ci/README.md

@@ -7,8 +7,8 @@ Base image used on CI for all builds and test jobs.
 #### Build and Test
 
 ```
-$ docker build -t registry.svc.ci.openshift.org/integr8ly/intly-operator-base-image:latest - < Dockerfile.tools
-$ IMAGE_NAME=registry.svc.ci.openshift.org/integr8ly/intly-operator-base-image:latest test/run
+$ docker build -t registry.svc.ci.openshift.org/integr8ly/grafana-operator-base-image:latest - < Dockerfile.tools
+$ IMAGE_NAME=registry.svc.ci.openshift.org/integr8ly/grafana-operator-base-image:latest test/run
 operator-sdk version: "v0.12.0", commit: "2445fcda834ca4b7cf0d6c38fba6317fb219b469", go version: "go1.13.5 linux/amd64"
 go version go1.13.5 linux/amd64
 go mod tidy

openshift-ci/test/run

@@ -9,12 +9,7 @@ WORK_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'operator-sdk version'
 docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'go version'
-docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'jq --version'
-docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'yq --version'
-docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'node --version'
-docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'delorean --help'
-docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'skopeo --version'
-docker run --rm --entrypoint=/bin/sh ${IMAGE_NAME} -c 'rsync --version'
+
 
 docker run --rm -u $UID -v "${WORK_DIR}/../..:/grafana-operator:z" --entrypoint=/bin/sh ${IMAGE_NAME} -c "cd /grafana-operator && make code/check"
 docker run --rm -u $UID -v "${WORK_DIR}/../..:/grafana-operator:z" --entrypoint=/bin/sh ${IMAGE_NAME} -c "cd /grafana-operator && make code/compile"