From b19e67dab2394e9318e7e375f17c36a8773bb151 Mon Sep 17 00:00:00 2001 From: Olivier Cazade Date: Thu, 13 Feb 2025 16:03:52 +0100 Subject: [PATCH 1/2] Revert "Building frontend only once (#718) (#722)" This reverts commit a323538c7ca4eef66ebfe27d6b1ff8eb5086b002. --- ...ility-console-plugin-1-8-pull-request.yaml | 4 ++ ...observability-console-plugin-1-8-push.yaml | 4 ++ .tekton/pipeline-ref.yaml | 53 ------------------- Dockerfile.downstream | 20 ++++++- Dockerfile.front.downstream | 22 -------- 5 files changed, 26 insertions(+), 77 deletions(-) delete mode 100644 Dockerfile.front.downstream diff --git a/.tekton/network-observability-console-plugin-1-8-pull-request.yaml b/.tekton/network-observability-console-plugin-1-8-pull-request.yaml index a8cf588b3..c5339dfaa 100644 --- a/.tekton/network-observability-console-plugin-1-8-pull-request.yaml +++ b/.tekton/network-observability-console-plugin-1-8-pull-request.yaml @@ -28,6 +28,10 @@ spec: value: 5d - name: dockerfile value: Dockerfile.downstream + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le pipelineRef: name: build-pipeline taskRunTemplate: {} diff --git a/.tekton/network-observability-console-plugin-1-8-push.yaml b/.tekton/network-observability-console-plugin-1-8-push.yaml index 761d966a9..2d37a03ab 100644 --- a/.tekton/network-observability-console-plugin-1-8-push.yaml +++ b/.tekton/network-observability-console-plugin-1-8-push.yaml @@ -26,6 +26,10 @@ spec: value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/netobserv-operator/network-observability-console-plugin:{{revision}} - name: dockerfile value: Dockerfile.downstream + - name: build-platforms + value: + - linux/x86_64 + - linux/ppc64le pipelineRef: name: build-pipeline taskRunTemplate: {} diff --git a/.tekton/pipeline-ref.yaml b/.tekton/pipeline-ref.yaml index e70a5b1b0..c0c9b4c3c 100644 --- a/.tekton/pipeline-ref.yaml +++ b/.tekton/pipeline-ref.yaml @@ -42,11 +42,6 @@ spec: path-context name: dockerfile type: string - - default: "Dockerfile.front.downstream" - description: Path to the frontend Dockerfile inside the context specified by parameter - path-context - name: front-dockerfile - type: string - default: "false" description: Force rebuild image name: rebuild @@ -178,52 +173,6 @@ spec: workspace: git-auth - name: netrc workspace: netrc - - name: build-front-container - params: - - name: IMAGE - value: "$(params.output-image)-front" - - name: DOCKERFILE - value: $(params.front-dockerfile) - - name: CONTEXT - value: $(params.path-context) - - name: HERMETIC - value: $(params.hermetic) - - name: PREFETCH_INPUT - value: $(params.prefetch-input) - - name: IMAGE_EXPIRES_AFTER - value: $(params.image-expires-after) - - name: COMMIT_SHA - value: $(tasks.clone-repository.results.commit) - - name: BUILD_ARGS - value: - - $(params.build-args[*]) - - "COMMIT=$(tasks.clone-repository.results.commit)" - - "BUILDVERSION=$(params.build-version)" - - "DATE=$(tasks.clone-repository.results.commit-timestamp)" - - name: BUILD_ARGS_FILE - value: $(params.build-args-file) - - name: SOURCE_ARTIFACT - value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT) - - name: CACHI2_ARTIFACT - value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT) - - name: PLATFORM - value: "linux/x86_64" - runAfter: - - prefetch-dependencies - taskRef: - params: - - name: name - value: buildah-remote-oci-ta - - name: bundle - value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.3@sha256:3070ee1a75e9a5a0a082008e1f9b3d2df7a9508ca107678b2613dc201eb2e279 - - name: kind - value: task - resolver: bundles - when: - - input: $(tasks.init.results.build) - operator: in - values: - - "true" - name: build-container matrix: params: @@ -251,7 +200,6 @@ spec: - "COMMIT=$(tasks.clone-repository.results.commit)" - "BUILDVERSION=$(params.build-version)" - "DATE=$(tasks.clone-repository.results.commit-timestamp)" - - "FRONTBUILD=$(params.output-image)-front" - name: BUILD_ARGS_FILE value: $(params.build-args-file) - name: SOURCE_ARTIFACT @@ -262,7 +210,6 @@ spec: value: "true" runAfter: - prefetch-dependencies - - build-front-container taskRef: params: - name: name diff --git a/Dockerfile.downstream b/Dockerfile.downstream index 35c72ba12..b4798e9d2 100644 --- a/Dockerfile.downstream +++ b/Dockerfile.downstream @@ -1,7 +1,23 @@ ARG COMMIT -ARG FRONTBUILD -FROM $FRONTBUILD as web-builder +FROM registry.access.redhat.com/ubi9/nodejs-18:1-108.1716477799 as web-builder + +ARG BUILDSCRIPT +WORKDIR /opt/app-root + +COPY --chown=default web/package.json web/package.json +COPY --chown=default web/package-lock.json web/package-lock.json +WORKDIR /opt/app-root/web + +RUN CYPRESS_INSTALL_BINARY=0 node --max-old-space-size=6000 $(which npm) --legacy-peer-deps ci + +WORKDIR /opt/app-root +COPY --chown=default web web +COPY --chown=default mocks mocks + +WORKDIR /opt/app-root/web +RUN npm run format-all +RUN npm run build$BUILDSCRIPT FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23 as go-builder diff --git a/Dockerfile.front.downstream b/Dockerfile.front.downstream deleted file mode 100644 index c249352fe..000000000 --- a/Dockerfile.front.downstream +++ /dev/null @@ -1,22 +0,0 @@ -FROM registry.access.redhat.com/ubi9/nodejs-18:1-108.1716477799 as web-builder - -ARG BUILDSCRIPT -WORKDIR /opt/app-root - -COPY --chown=default web/package.json web/package.json -COPY --chown=default web/package-lock.json web/package-lock.json -WORKDIR /opt/app-root/web - -RUN CYPRESS_INSTALL_BINARY=0 node --max-old-space-size=6000 $(which npm) --legacy-peer-deps ci - -WORKDIR /opt/app-root -COPY --chown=default web web -COPY --chown=default mocks mocks - -WORKDIR /opt/app-root/web -RUN npm run format-all -RUN npm run build$BUILDSCRIPT - -FROM scratch - -COPY --from=web-builder /opt/app-root/web/dist /opt/app-root/web/dist From f0cebb2c6cc4fe4391847d90a044ccabeaea3f73 Mon Sep 17 00:00:00 2001 From: Olivier Cazade Date: Thu, 13 Feb 2025 16:08:37 +0100 Subject: [PATCH 2/2] Enabling all architectures --- ...network-observability-console-plugin-1-8-pull-request.yaml | 4 ---- .tekton/network-observability-console-plugin-1-8-push.yaml | 4 ---- 2 files changed, 8 deletions(-) diff --git a/.tekton/network-observability-console-plugin-1-8-pull-request.yaml b/.tekton/network-observability-console-plugin-1-8-pull-request.yaml index c5339dfaa..a8cf588b3 100644 --- a/.tekton/network-observability-console-plugin-1-8-pull-request.yaml +++ b/.tekton/network-observability-console-plugin-1-8-pull-request.yaml @@ -28,10 +28,6 @@ spec: value: 5d - name: dockerfile value: Dockerfile.downstream - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le pipelineRef: name: build-pipeline taskRunTemplate: {} diff --git a/.tekton/network-observability-console-plugin-1-8-push.yaml b/.tekton/network-observability-console-plugin-1-8-push.yaml index 2d37a03ab..761d966a9 100644 --- a/.tekton/network-observability-console-plugin-1-8-push.yaml +++ b/.tekton/network-observability-console-plugin-1-8-push.yaml @@ -26,10 +26,6 @@ spec: value: quay.io/redhat-user-workloads/ocp-network-observab-tenant/netobserv-operator/network-observability-console-plugin:{{revision}} - name: dockerfile value: Dockerfile.downstream - - name: build-platforms - value: - - linux/x86_64 - - linux/ppc64le pipelineRef: name: build-pipeline taskRunTemplate: {}