From f8b65a0fd2e19bb15a962b53a6e4ee597854078c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20St=C3=A4bler?= Date: Wed, 2 Oct 2024 15:53:10 +0200 Subject: [PATCH] Rerun dockerfile generator --- openshift/ci-operator/build-image/Dockerfile | 29 ++++++--- .../knative-images/func-util/Dockerfile | 6 +- rpms.lock.yaml | 61 +++++++++++++++++++ 3 files changed, 87 insertions(+), 9 deletions(-) create mode 100644 rpms.lock.yaml diff --git a/openshift/ci-operator/build-image/Dockerfile b/openshift/ci-operator/build-image/Dockerfile index 03b9913e1a..deaa531992 100755 --- a/openshift/ci-operator/build-image/Dockerfile +++ b/openshift/ci-operator/build-image/Dockerfile @@ -1,11 +1,26 @@ -ARG OCP_VERSION=4.17 -ARG GOLANG_VERSION=1.22 -FROM registry.ci.openshift.org/ocp/${OCP_VERSION}:tools as tools +# DO NOT EDIT! Generated Dockerfile. -FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-${GOLANG_VERSION}-openshift-${OCP_VERSION} +FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools + +# Dockerfile to bootstrap build and test in openshift-ci +FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder + +ARG TARGETARCH + +COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc -COPY --from=tools /usr/bin/oc /usr/bin/ RUN ln -s /usr/bin/oc /usr/bin/kubectl -# Reset the goflags to avoid the -mod=vendor flag -ENV GOFLAGS='' \ No newline at end of file +RUN yum install -y httpd-tools + +RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \ + chmod 700 ./get-helm-3 + +RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version + +RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest +RUN GOFLAGS='' go install -tags="exclude_graphdriver_btrfs containers_image_openpgp" github.com/containers/skopeo/cmd/skopeo@v1.16.1 + +# go install creates $GOPATH/.cache with root permissions, we delete it here +# to avoid permission issues with the runtime users +RUN rm -rf $GOPATH/.cache diff --git a/openshift/ci-operator/knative-images/func-util/Dockerfile b/openshift/ci-operator/knative-images/func-util/Dockerfile index c15cdd8934..ddf4908fb1 100755 --- a/openshift/ci-operator/knative-images/func-util/Dockerfile +++ b/openshift/ci-operator/knative-images/func-util/Dockerfile @@ -16,7 +16,7 @@ FROM $GO_RUNTIME ARG VERSION=knative-nightly -RUN microdnf install tzdata socat tar +RUN microdnf install socat tar COPY --from=builder /usr/bin/main /usr/bin/func-util @@ -33,6 +33,8 @@ LABEL \ summary="Red Hat OpenShift Serverless 1 Kn Plugin Func Func Util" \ maintainer="serverless-support@redhat.com" \ description="Red Hat OpenShift Serverless 1 Kn Plugin Func Func Util" \ - io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Plugin Func Func Util" + io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Plugin Func Func Util" \ + io.k8s.description="Red Hat OpenShift Serverless Kn Plugin Func Func Util" \ + io.openshift.tags="func-util" ENTRYPOINT ["/usr/bin/bash"] diff --git a/rpms.lock.yaml b/rpms.lock.yaml new file mode 100644 index 0000000000..86913b228b --- /dev/null +++ b/rpms.lock.yaml @@ -0,0 +1,61 @@ +# url=""; curl $url -o my-rpm.rpm; stat my-rpm.rpm; sha256sum my-rpm.rpm; + +lockfileVersion: 1 +lockfileVendor: redhat +arches: + - arch: x86_64 + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/appstream/os/Packages/s/socat-1.7.4.1-1.el8.x86_64.rpm" + size: 330744 + checksum: "sha256:b03b86ac05bd5871f14e00400a6ddd30d8e9ed97b93e56e96789706c36e2f379" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tar-1.30-9.el8.x86_64.rpm" + size: 858812 + checksum: "sha256:6b0dc7341d743c89fa038292a7e04761ebb6cc98208ebc26dee9f01e2c1a9529" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.x86_64.rpm" + size: 420156 + checksum: "sha256:7aef9de61fbf590995b07d92f99a3f3478d6c0543d7a6e1ebb6f4b1c02334283" + - arch: aarch64 + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/appstream/os/Packages/s/socat-1.7.4.1-1.el8.aarch64.rpm" + size: 320544 + checksum: "sha256:4e8380ed4b4570663136b8b499bfe343b688bda676028ef5172d2155ac80e6ae" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tar-1.30-9.el8.aarch64.rpm" + size: 849892 + checksum: "sha256:3ba95ecab30f49ecf168ee37e6bc332b626bde62ef7bf61801613f93e2126d8e" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.aarch64.rpm" + size: 410088 + checksum: "sha256:d700d21063ae2b609031a3a8772012aff012899062e952ca43370c495f7e40ff" + - arch: s390x + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/appstream/os/Packages/s/socat-1.7.4.1-1.el8.s390x.rpm" + size: 320544 + checksum: "sha256:4e8380ed4b4570663136b8b499bfe343b688bda676028ef5172d2155ac80e6ae" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tar-1.30-9.el8.s390x.rpm" + size: 853548 + checksum: "sha256:1efadfc1d2113503b8b0e95939c4cb98a7e0095fb383dec2ac4bf652822a8d87" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.s390x.rpm" + size: 413364 + checksum: "sha256:8819079e4ea1236eab315348584007918798776c6ea23dae5725544148316cfb" + - arch: ppc64le + packages: + - repoid: ubi-8-appstream-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/appstream/os/Packages/s/socat-1.7.4.1-1.el8.ppc64le.rpm" + size: 337076 + checksum: "sha256:51f267ce6469e7967815e1f202b8afa84010717ff24fbff30c7c1bc9ee15d1d1" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tar-1.30-9.el8.ppc64le.rpm" + size: 878620 + checksum: "sha256:c34619440c83b785306420d9ae4a21ccbafe09815e5631510cccb6433f435a47" + - repoid: ubi-8-baseos-rpms + url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/r/rsync-3.1.3-19.el8_7.1.ppc64le.rpm" + size: 442696 + checksum: "sha256:698ca98abf03ab4dcc3d4d1795f4a392d33a2e84f0b1b1f4b9856b38e8ef0b77"