Skip to content

Commit

Permalink
Merge pull request #270 from savitaashture/fix_ec_cp
Browse files Browse the repository at this point in the history
update base image sha o fix ec failure
  • Loading branch information
savitaashture authored Feb 13, 2025
2 parents b1433bd + 68c05c1 commit bc6b215
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .konflux/dockerfiles/console-plugin.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG BUILDER=registry.redhat.io/ubi9/nodejs-18@sha256:07c63a0d34c93d332e3ed0a71a928a4928072f72e04616713c4786d70fa3eb0f
ARG RUNTIME=registry.access.redhat.com/ubi9/nginx-124@sha256:a39459f55e5f8df68b9b58fd33cd53c8acabbbb9cd3df1a071187e071858f32f
ARG RUNTIME=registry.access.redhat.com/ubi9/nginx-124@sha256:069d1301bd51f2293427df0104fbdb52246a21fb33c27ebcb958cfd5f5656e17

FROM $BUILDER AS builder-ui

Expand All @@ -17,6 +17,11 @@ ARG VERSION=console-plugin-1-18
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

USER root
RUN dnf install -y openssl-libs && \
dnf install -y libxml2 && \
dnf install -y openssl

USER 1001

ENTRYPOINT ["nginx", "-g", "daemon off;"]
Expand Down
2 changes: 1 addition & 1 deletion .konflux/rpms/rpms.in.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
contentOrigin:
repofiles:
- ./ubi.repo
packages: [openssl-libs-3.2.2-6.el9_5.1]
packages: [openssl-libs-3.2.2-6.el9_5.1, libxml2-2.9.13-6.el9_5.1, openssl-3.2.2-6.el9_5.1]
arches:
# The list of architectures
- aarch64
Expand Down
28 changes: 28 additions & 0 deletions .konflux/rpms/rpms.lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ lockfileVendor: redhat
arches:
- arch: aarch64
packages:
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/l/libxml2-2.9.13-6.el9_5.1.aarch64.rpm
repoid: ubi-9-for-aarch64-baseos-rpms
size: 752140
checksum: sha256:d90be7f67850e132d2453875ecabd9ff18f571672239ce2f2162548a5726a948
name: libxml2
evr: 2.9.13-6.el9_5.1
sourcerpm: libxml2-2.9.13-6.el9_5.1.src.rpm
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/aarch64/baseos/os/Packages/o/openssl-3.2.2-6.el9_5.1.aarch64.rpm
repoid: ubi-9-for-aarch64-baseos-rpms
size: 1398689
Expand All @@ -22,6 +29,13 @@ arches:
module_metadata: []
- arch: ppc64le
packages:
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/l/libxml2-2.9.13-6.el9_5.1.ppc64le.rpm
repoid: ubi-9-for-ppc64le-baseos-rpms
size: 847982
checksum: sha256:59a6795d37065e327ab4a9943d0045e87ad1f09a967c25c744cc7978a93190b8
name: libxml2
evr: 2.9.13-6.el9_5.1
sourcerpm: libxml2-2.9.13-6.el9_5.1.src.rpm
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/ppc64le/baseos/os/Packages/o/openssl-3.2.2-6.el9_5.1.ppc64le.rpm
repoid: ubi-9-for-ppc64le-baseos-rpms
size: 1422952
Expand All @@ -40,6 +54,13 @@ arches:
module_metadata: []
- arch: s390x
packages:
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/l/libxml2-2.9.13-6.el9_5.1.s390x.rpm
repoid: ubi-9-for-s390x-baseos-rpms
size: 731142
checksum: sha256:ded56815616f976284aaf1ce387293e7b7ff69afe8fcdea8e712e12aab1a1166
name: libxml2
evr: 2.9.13-6.el9_5.1
sourcerpm: libxml2-2.9.13-6.el9_5.1.src.rpm
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/s390x/baseos/os/Packages/o/openssl-3.2.2-6.el9_5.1.s390x.rpm
repoid: ubi-9-for-s390x-baseos-rpms
size: 1407537
Expand All @@ -58,6 +79,13 @@ arches:
module_metadata: []
- arch: x86_64
packages:
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/l/libxml2-2.9.13-6.el9_5.1.x86_64.rpm
repoid: ubi-9-for-x86_64-baseos-rpms
size: 769763
checksum: sha256:3a6e88914456bb121923e8e3c984249bed039d7257e4af37870af2f6c92886de
name: libxml2
evr: 2.9.13-6.el9_5.1
sourcerpm: libxml2-2.9.13-6.el9_5.1.src.rpm
- url: https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/o/openssl-3.2.2-6.el9_5.1.x86_64.rpm
repoid: ubi-9-for-x86_64-baseos-rpms
size: 1420999
Expand Down

0 comments on commit bc6b215

Please sign in to comment.