[WIP] CONSOLE-4083: Remove Dockerfile.builder and make other container file changes

Dockerfile

@@ -1,7 +1,7 @@
 ##################################################
 #
 # go backend build
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS gobuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS gobuilder
 RUN mkdir -p /go/src/github.com/openshift/console/
 ADD . /go/src/github.com/openshift/console/
 WORKDIR /go/src/github.com/openshift/console/
@@ -11,7 +11,7 @@ RUN ./build-backend.sh
 ##################################################
 #
 # nodejs frontend build
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.16 AS nodebuilder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.17 AS nodebuilder
 
 ADD . .
 
@@ -51,7 +51,7 @@ RUN container-entrypoint ./build-frontend.sh
 ##################################################
 #
 # actual base image for final product
-FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
 RUN mkdir -p /opt/bridge/bin
 COPY --from=gobuilder /go/src/github.com/openshift/console/bin/bridge /opt/bridge/bin
 COPY --from=nodebuilder /opt/app-root/src/frontend/public/dist /opt/bridge/static

Dockerfile.cypress

@@ -0,0 +1,68 @@
+##################################################
+#
+# cypress image
+FROM cypress/included:13.10.0
+
+##################################################
+#
+# go backend build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS gobuilder
+RUN mkdir -p /go/src/github.com/openshift/console/
+ADD . /go/src/github.com/openshift/console/
+WORKDIR /go/src/github.com/openshift/console/
+RUN ./build-backend.sh
+
+
+##################################################
+#
+# nodejs frontend build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.17 AS nodebuilder
+
+ADD . .
+
+USER 0
+
+ARG YARN_VERSION=v1.22.19
+
+# bootstrap yarn so we can install and run the other tools.
+RUN CACHED_YARN=./artifacts/yarn-${YARN_VERSION}.tar.gz; \
+  if [ -f ${CACHED_YARN} ]; then \
+  npm install ${CACHED_YARN}; \
+  else \
+  npm install https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz; \
+  fi
+
+# The REMOTE_SOURCES value is set by the build system to indicate the location of the cachito-backed artifacts cache.
+# As cachito might not be available in all environments, we need to make sure the value is set before trying to use it and
+# that the COPY layer below doesn't fail. Setting it to be the Dockerfile itself is fairly safe, as it will always be
+# available.
+ARG REMOTE_SOURCES=./Dockerfile.product
+ARG REMOTE_SOURCE_DIR=/tmp/remote-sources
+
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+
+# use dependencies provided by Cachito
+RUN test -d ${REMOTE_SOURCES}/cachito-gomod-with-deps || exit 0; \
+  cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/registry-ca.pem . \
+  && cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/frontend/{.npmrc,.yarnrc,yarn.lock} frontend/
+
+# run the build
+RUN container-entrypoint ./build-frontend.sh
+
+
+##################################################
+#
+# actual base image for final product
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
+RUN mkdir -p /opt/bridge/bin
+COPY --from=gobuilder /go/src/github.com/openshift/console/bin/bridge /opt/bridge/bin
+COPY --from=nodebuilder /opt/app-root/src/frontend/public/dist /opt/bridge/static
+COPY --from=gobuilder /go/src/github.com/openshift/console/pkg/graphql/schema.graphql /pkg/graphql/schema.graphql
+
+WORKDIR /
+# doesn't require a root user.
+USER 1001
+
+CMD [ "/opt/bridge/bin/bridge", "--public-dir=/opt/bridge/static" ]
+
+

Dockerfile.dev

@@ -1,15 +1,26 @@
 # Dockerfile to build console image from pre-built front end.
 
-FROM quay.io/coreos/tectonic-console-builder:v26 AS build
+##################################################
+#
+# go backend build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS gobuilder
 RUN mkdir -p /go/src/github.com/openshift/console/
 ADD . /go/src/github.com/openshift/console/
 WORKDIR /go/src/github.com/openshift/console/
 RUN ./build-backend.sh
 
-FROM openshift/origin-base
-COPY --from=build /go/src/github.com/openshift/console/bin/bridge /opt/bridge/bin/bridge
+
+##################################################
+#
+# copy local pre-built nodejs frontend build
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
+RUN mkdir -p /opt/bridge/bin
+COPY --from=gobuilder /go/src/github.com/openshift/console/bin/bridge /opt/bridge/bin/bridge
 COPY ./frontend/public/dist /opt/bridge/static
-COPY ./pkg/graphql/schema.graphql /pkg/graphql/schema.graphql
+COPY --from=gobuilder /go/src/github.com/openshift/console/pkg/graphql/schema.graphql /pkg/graphql/schema.graphql
 
+WORKDIR /
+# doesn't require a root user.
 USER 1001
+
 CMD [ "/opt/bridge/bin/bridge", "--public-dir=/opt/bridge/static" ]

Dockerfile.plugins.demo

@@ -3,7 +3,38 @@
 # See dynamic-demo-plugin/README.md for details.
 
 # Stage 0: build the demo plugin
-FROM quay.io/coreos/tectonic-console-builder:v26 AS build
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-base-nodejs-openshift-4.17 AS nodebuilder
+
+ADD . .
+
+USER 0
+
+ARG YARN_VERSION=v1.22.19
+
+# bootstrap yarn so we can install and run the other tools.
+RUN CACHED_YARN=./artifacts/yarn-${YARN_VERSION}.tar.gz; \
+    if [ -f ${CACHED_YARN} ]; then \
+    npm install ${CACHED_YARN}; \
+    else \
+    npm install https://github.com/yarnpkg/yarn/releases/download/${YARN_VERSION}/yarn-${YARN_VERSION}.tar.gz; \
+    fi
+
+# The REMOTE_SOURCES value is set by the build system to indicate the location of the cachito-backed artifacts cache.
+# As cachito might not be available in all environments, we need to make sure the value is set before trying to use it and
+# that the COPY layer below doesn't fail. Setting it to be the Dockerfile itself is fairly safe, as it will always be
+# available.
+ARG REMOTE_SOURCES=./Dockerfile.product
+ARG REMOTE_SOURCE_DIR=/tmp/remote-sources
+
+COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR
+
+# use dependencies provided by Cachito
+RUN test -d ${REMOTE_SOURCES}/cachito-gomod-with-deps || exit 0; \
+    cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/registry-ca.pem . \
+    && cp -f $REMOTE_SOURCES_DIR/cachito-gomod-with-deps/app/frontend/{.npmrc,.yarnrc,yarn.lock} frontend/
+
+# prevent download of cypress binary as part of module installs
+ENV CYPRESS_INSTALL_BINARY=0
 
 RUN mkdir -p /src/console
 COPY . /src/console
@@ -16,16 +47,16 @@ RUN yarn install && \
     yarn build
 
 # Stage 1: build the target image
-FROM node:10
+FROM node:18
 
-COPY --from=build /src/console/dynamic-demo-plugin/dist /opt/console-plugin-demo/static
-COPY --from=build /src/console/dynamic-demo-plugin/node_modules /opt/console-plugin-demo/node_modules
-COPY --from=build /src/console/dynamic-demo-plugin/http-server.sh /opt/console-plugin-demo/http-server.sh
+COPY --from=nodebuilder /src/console/dynamic-demo-plugin/dist /opt/console-plugin-demo/static
+COPY --from=nodebuilder /src/console/dynamic-demo-plugin/node_modules /opt/console-plugin-demo/node_modules
+COPY --from=nodebuilder /src/console/dynamic-demo-plugin/http-server.sh /opt/console-plugin-demo/http-server.sh
 
 LABEL io.k8s.display-name="OpenShift Console Demo Plugin" \
-      io.k8s.description="Sample OpenShift Console dynamic plugin used for testing purposes." \
-      io.openshift.tags="openshift" \
-      maintainer="Vojtech Szocs <[email protected]>"
+    io.k8s.description="Sample OpenShift Console dynamic plugin used for testing purposes." \
+    io.openshift.tags="openshift" \
+    maintainer="Vojtech Szocs <[email protected]>"
 
 USER 1001
 

Dockerfile.plugins.demo2 → Dockerfile.plugins.demo.dev

@@ -1,3 +1,5 @@
+# Dockerfile to build console-demo-plugin image from pre-built front end.
+#
 # This image is used for testing OpenShift Console dynamic plugin capabilities.
 #
 # See dynamic-demo-plugin/README.md for details.
@@ -11,7 +13,7 @@
 # yarn build
 
 # Stage 1: build the target image
-FROM node:10
+FROM node:18
 
 COPY ./dynamic-demo-plugin/dist /opt/console-demo-plugin/static
 COPY ./dynamic-demo-plugin/node_modules /opt/console-demo-plugin/node_modules

README.md

@@ -108,25 +108,6 @@ In order to enable the monitoring UI and see the "Observe" navigation item while
   export BRIDGE_PLUGINS="monitoring-plugin=http://localhost:9001"
   ```
 
-#### Updating `tectonic-console-builder` image
-Updating `tectonic-console-builder` image is needed whenever there is a change in the build-time dependencies and/or go versions.
-
-In order to update the `tectonic-console-builder` to a new version i.e. v27, follow these steps:
-
-1. Update the `tectonic-console-builder` image tag in files listed below:
-   - .ci-operator.yaml
-   - Dockerfile.dev
-   - Dockerfile.plugins.demo
-   For example, `tectonic-console-builder:27`
-2. Update the dependencies in Dockerfile.builder file i.e. v18.0.0.
-3. Run `./push-builder.sh` script build and push the updated builder image to quay.io.
-   Note: You can test the image using `./builder-run.sh ./build-backend.sh`.
-   To update the image on quay.io, you need edit permission to the quay.io/coreos/  tectonic-console-builder repo. 
-4. Lastly, update the mapping of `tectonic-console-builder` image tag in 
-   [openshift/release](https:// github.com/openshift/release/blob/master/core-services/image-mirroring/supplemental-ci-images/mapping_supplemental_ci_images_ci) repository. 
-   Note: There could be scenario were you would have to add the new image reference in the "mapping_supplemental_ci_images_ci" file, i.e. to avoid CI downtime for upcoming release cycle. 
-   Optional: Request for the [rhel-8-base-nodejs-openshift-4.15](https://github.com/openshift-eng/ocp-build-data/pull/3775/files) nodebuilder update if it doesn't match the node version in `tectonic-console-builder`.
-
 #### CodeReady Containers
 
 If you want to use CodeReady for local development, first make sure [it is set up](https://crc.dev/crc/#setting-up-codeready-containers_gsg), and the [OpenShift cluster is started](https://crc.dev/crc/#starting-the-virtual-machine_gsg).