Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ integration-tests/screenshots
yarn-error.log
.DS_Store
*.pem
integration-tests/cypress-a11y-report.json
integration-tests/cypress-a11y-report.json
.yarn/
11 changes: 5 additions & 6 deletions .konflux/dockerfiles/console-plugin.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
ARG BUILDER=registry.redhat.io/ubi9/nodejs-22@sha256:04e9f3020875f3f6e99b9a96fe55e35e1b5c38974a1765a19153102a90abf967
ARG RUNTIME=registry.redhat.io/ubi9/nginx-124@sha256:aa73fdb10af2bf24611ba714a412c2e65cec88a00eee628a0f2a75e564ec18f2
ARG RUNTIME=registry.redhat.io/ubi9/nginx-124@sha256:ece0c2d70199f0bcd3316d6913ef4b8e815d0229693156dee4bad8d69b13edc6

FROM $BUILDER AS builder-ui

WORKDIR /go/src/github.com/openshift-pipelines/console-plugin
COPY . .
#Install Yarn
RUN if [[ -d /cachi2/output/deps/npm/ ]]; then \
npm install -g /cachi2/output/deps/npm/"$YARN_PKG" \
npm install -g /cachi2/output/deps/npm/yarnpkg-cli-dist-4.6.0.tgz; \
YARN_ENABLE_NETWORK=0; \
else \
npm install -g corepack; \
corepack enable ;\
corepack prepare yarn@4.6.0 --activate; \
echo "ERROR: Hermetic npm deps not injected"; \
exit 1; \
fi

# Install dependencies & build
Expand All @@ -21,7 +20,7 @@ RUN CYPRESS_INSTALL_BINARY=0 yarn install --immutable && \
yarn build

FROM $RUNTIME
ARG VERSION=console-plugin-main
ARG VERSION=console-plugin-main_ocp_4.22

COPY --from=builder-ui /go/src/github.com/openshift-pipelines/console-plugin/dist /usr/share/nginx/html
COPY --from=builder-ui /go/src/github.com/openshift-pipelines/console-plugin/nginx.conf /etc/nginx/nginx.conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
value: .konflux/dockerfiles/console-plugin.Dockerfile
- name: prefetch-input
value: |
{"type": "rpm", "path": ".konflux/rpms"}
[{"type": "yarn"}, {"type": "npm", "path": ".konflux/npm"}]
pipelineRef:
name: docker-build-ta
taskRunTemplate:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
value: .konflux/dockerfiles/console-plugin.Dockerfile
- name: prefetch-input
value: |
{"type": "rpm", "path": ".konflux/rpms"}
[{"type": "yarn"}, {"type": "npm", "path": ".konflux/npm"}]
pipelineRef:
name: docker-build-ta
taskRunTemplate:
Expand Down
10 changes: 9 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
# .yarnrc.yml
nodeLinker: node-modules

supportedArchitectures:
os:
- linux
cpu:
- x64
- arm64
- s390x
- ppc64

# Force packages to use the same webpack instance
packageExtensions:
"@openshift-console/dynamic-plugin-sdk-webpack@*":
Expand Down