Skip to content

Commit 789126a

Browse files
Merge pull request #940 from anwesha-palit-redhat/release-v1.20.x-temp-2
Yarn 4 multi-arch support for release v1.20.x
2 parents bd5cae2 + eaf1d3c commit 789126a

3 files changed

Lines changed: 11 additions & 6 deletions

File tree

.konflux/dockerfiles/console-plugin.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BUILDER=registry.redhat.io/ubi9/nodejs-20@sha256:b45e1ba00ca4bda7575f3ef2a5000ea679e64b9892daa1d8ec850ae38f1d9259
2-
ARG RUNTIME=registry.redhat.io/ubi9/nginx-124@sha256:b9c2c8657761ea521f49ade5b330e5f81ac03372a093588f142de736e13336af
2+
ARG RUNTIME=registry.redhat.io/ubi9/nginx-124@sha256:b9c2c8657761ea521f49ade5b330e5f81ac03372a093588f142de736e13336af
33

44
FROM $BUILDER AS builder-ui
55

@@ -15,12 +15,12 @@ RUN if [[ -d /cachi2/output/deps/npm/ ]]; then \
1515
corepack prepare yarn@4.6.0 --activate; \
1616
fi
1717

18-
1918
# Install dependencies & build
2019
USER root
2120
RUN CYPRESS_INSTALL_BINARY=0 yarn install --immutable && \
2221
yarn build
2322

23+
2424
FROM $RUNTIME
2525
ARG VERSION=console-plugin-1.20
2626

.tekton/console-plugin-1-20-console-plugin-pull-request.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ spec:
3434
value: 5d
3535
- name: dockerfile
3636
value: .konflux/dockerfiles/console-plugin.Dockerfile
37-
- name: build-platforms
38-
value:
39-
- linux/x86_64
4037
- name: prefetch-input
4138
value: |
4239
[{"type": "yarn"}, {"type": "npm", "path": ".konflux/npm"}]

.yarnrc.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
# .yarnrc.yml
21
nodeLinker: node-modules
32

3+
supportedArchitectures:
4+
os:
5+
- linux
6+
cpu:
7+
- x64
8+
- arm64
9+
- s390x
10+
- ppc64
11+
412
# Force packages to use the same webpack instance
513
packageExtensions:
614
"@openshift-console/dynamic-plugin-sdk-webpack@*":

0 commit comments

Comments
 (0)