From c87651d581df8cf3af594d6b04e6b0e10fc2d272 Mon Sep 17 00:00:00 2001
From: Olivier Cazade <ocazade@redhat.com>
Date: Thu, 13 Feb 2025 16:35:41 +0100
Subject: [PATCH 1/2] WIP Revert "Building frontend only once (#718) (#722)"
 (#729)

* Revert "Building frontend only once (#718) (#722)"

This reverts commit a323538c7ca4eef66ebfe27d6b1ff8eb5086b002.

* Enabling all architectures
---
 .tekton/pipeline-ref.yaml   | 53 -------------------------------------
 Dockerfile.downstream       | 20 ++++++++++++--
 Dockerfile.front.downstream | 22 ---------------
 3 files changed, 18 insertions(+), 77 deletions(-)
 delete mode 100644 Dockerfile.front.downstream

diff --git a/.tekton/pipeline-ref.yaml b/.tekton/pipeline-ref.yaml
index 42e4b744a..6b6f7f609 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.4@sha256:5b8e8253b6be14f555014b7055665e25ae138fa3e5b52a65e0ba3f2f6ff3d5bb
-      - 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 6092f4d75..d0e404a73 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 d6799b84b7ee137b9942c37b1ffa6011b7d78bb9 Mon Sep 17 00:00:00 2001
From: Olivier Cazade <ocazade@redhat.com>
Date: Fri, 14 Feb 2025 16:54:54 +0100
Subject: [PATCH 2/2] Adding ignore-script flag to npm during konflux builds
 (#733)

---
 Dockerfile.downstream | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile.downstream b/Dockerfile.downstream
index d0e404a73..2384e15eb 100644
--- a/Dockerfile.downstream
+++ b/Dockerfile.downstream
@@ -9,7 +9,7 @@ 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
+RUN CYPRESS_INSTALL_BINARY=0 node --max-old-space-size=6000 $(which npm) --legacy-peer-deps ci --ignore-scripts
 
 WORKDIR /opt/app-root
 COPY  --chown=default web web