Run ./openshift/scripts/generate-dockerfiles.sh

openshift-knative · Jan 15, 2025 · 54cddf3 · 54cddf3
1 parent ac1066d
commit 54cddf3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/openshift/ci-operator/knative-images/func-util/Dockerfile b/openshift/ci-operator/knative-images/func-util/Dockerfile
@@ -4,6 +4,7 @@ ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
 
 FROM $GO_BUILDER as builder
 
+WORKDIR /workspace
 COPY . .
 
 ENV CGO_ENABLED=1
@@ -14,11 +15,12 @@ RUN go build -tags strictfipsruntime,exclude_graphdriver_btrfs -o /usr/bin/main
 
 FROM $GO_RUNTIME
 
-ARG VERSION=knative-nightly
+ARG VERSION=knative-v1.16
 
-RUN microdnf install socat tar 
+RUN microdnf install socat tar
 
 COPY --from=builder /usr/bin/main /usr/bin/func-util
+COPY LICENSE /licenses/
 
 RUN ln -s /usr/bin/func-util /usr/local/bin/deploy && \
 	ln -s /usr/bin/func-util /usr/local/bin/scaffold && \

diff --git a/openshift/images.yaml b/openshift/images.yaml
@@ -1 +1 @@
-knative.dev/func/cmd/func-util: registry.ci.openshift.org/openshift/knative-kn-plugin-func-func-util:knative-nightly
+knative.dev/func/cmd/func-util: registry.ci.openshift.org/openshift/knative-kn-plugin-func-func-util:knative-v1.16
diff --git a/rpms.lock.yaml b/rpms.lock.yaml
@@ -17,6 +17,10 @@ arches:
         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"
+      - repoid: ubi-8-baseos-rpms
+        url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/x86_64/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm"
+        size: 486864
+        checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500"
   - arch: aarch64
     packages:
       - repoid: ubi-8-appstream-rpms
@@ -31,6 +35,10 @@ arches:
         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"
+      - repoid: ubi-8-baseos-rpms
+        url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/aarch64/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm"
+        size: 486864
+        checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500"
   - arch: s390x
     packages:
       - repoid: ubi-8-appstream-rpms
@@ -45,6 +53,10 @@ arches:
         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"
+      - repoid: ubi-8-baseos-rpms
+        url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/s390x/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm"
+        size: 486864
+        checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500"
   - arch: ppc64le
     packages:
       - repoid: ubi-8-appstream-rpms
@@ -59,3 +71,7 @@ arches:
         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"
+      - repoid: ubi-8-baseos-rpms
+        url: "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi8/8/ppc64le/baseos/os/Packages/t/tzdata-2024b-4.el8.noarch.rpm"
+        size: 486864
+        checksum: "sha256:b629ec4b416d8127314c8aecce5ada2c0c102f5dbdeb48f9a3739cbcdf2ee500"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		knative.dev/func/cmd/func-util: registry.ci.openshift.org/openshift/knative-kn-plugin-func-func-util:knative-nightly
		knative.dev/func/cmd/func-util: registry.ci.openshift.org/openshift/knative-kn-plugin-func-func-util:knative-v1.16