Skip to content

Commit 24febbd

Browse files
cardilcardil
committed
📼 Images generated
1 parent b8111ce commit 24febbd

7 files changed

Lines changed: 75 additions & 25 deletions

File tree

‎openshift/ci-operator/build-image/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 &&
1919
RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version
2020

2121
RUN GOFLAGS='' go install github.com/mikefarah/yq/v3@latest
22-
RUN GOFLAGS='' go install -tags="exclude_graphdriver_btrfs containers_image_openpgp" github.com/containers/skopeo/cmd/skopeo@v1.16.1
22+
RUN GOFLAGS='' go install -tags="exclude_graphdriver_btrfs containers_image_openpgp" github.com/containers/skopeo/cmd/skopeo@v1.17.0
2323

2424
# go install creates $GOPATH/.cache with root permissions, we delete it here
2525
# to avoid permission issues with the runtime users

‎openshift/ci-operator/images/kn-event-sender/Dockerfile‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# DO NOT EDIT! Generated Dockerfile for cmd/kn-event-sender (modified!!).
1+
# DO NOT EDIT! Generated Dockerfile for ./cmd/kn-event-sender.
22
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
33
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
44

@@ -9,14 +9,13 @@ COPY . .
99

1010
ENV CGO_ENABLED=1
1111
ENV GOEXPERIMENT=strictfipsruntime
12-
# Reset the goflags to avoid the -mod=vendor flag
13-
ENV GOFLAGS=''
12+
GOFLAGS=''
1413

1514
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn-event-sender
1615

1716
FROM $GO_RUNTIME
1817

19-
ARG VERSION=knative-v1.16
18+
ARG VERSION=
2019

2120
COPY --from=builder /usr/bin/main /usr/bin/kn-event-sender
2221
COPY LICENSE /licenses/
@@ -25,7 +24,7 @@ USER 65532
2524

2625
LABEL \
2726
com.redhat.component="openshift-serverless-1-kn-event-sender-rhel8-container" \
28-
name="openshift-serverless-1-tech-preview/kn-event-sender-rhel8" \
27+
name="openshift-serverless-1/kn-event-sender-rhel8" \
2928
version=$VERSION \
3029
summary="Red Hat OpenShift Serverless 1 Kn Event Sender" \
3130
maintainer="serverless-support@redhat.com" \

‎openshift/ci-operator/images/kn-event/Dockerfile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# DO NOT EDIT! Generated Dockerfile for ./cmd/kn-event.
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
3+
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
4+
5+
FROM $GO_BUILDER as builder
6+
7+
WORKDIR /workspace
8+
COPY . .
9+
10+
ENV CGO_ENABLED=1
11+
ENV GOEXPERIMENT=strictfipsruntime
12+
GOFLAGS=''
13+
14+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn-event
15+
16+
FROM $GO_RUNTIME
17+
18+
ARG VERSION=
19+
20+
COPY --from=builder /usr/bin/main /usr/bin/kn-event
21+
COPY LICENSE /licenses/
22+
23+
USER 65532
24+
25+
LABEL \
26+
com.redhat.component="openshift-serverless-1-kn-event-rhel8-container" \
27+
name="openshift-serverless-1/kn-event-rhel8" \
28+
version=$VERSION \
29+
summary="Red Hat OpenShift Serverless 1 Kn Event" \
30+
maintainer="serverless-support@redhat.com" \
31+
description="Red Hat OpenShift Serverless 1 Kn Event" \
32+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Event" \
33+
io.k8s.description="Red Hat OpenShift Serverless Kn Event" \
34+
io.openshift.tags="kn-event"
35+
36+
ENTRYPOINT ["/usr/bin/kn-event"]

‎openshift/ci-operator/source-image/Dockerfile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# DO NOT EDIT! Generated Dockerfile.
2+
3+
FROM src
4+
5+
RUN chmod +x vendor/k8s.io/code-generator/generate-groups.sh || true
6+
RUN chmod +x vendor/knative.dev/pkg/hack/generate-knative.sh || true
7+
RUN chmod +x vendor/k8s.io/code-generator/generate-internal-groups.sh || true

‎openshift/ci-operator/test-images/eventshub/Dockerfile‎

100644100755
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
1+
# DO NOT EDIT! Generated Dockerfile for knative.dev/reconciler-test/cmd/eventshub.
12
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
23
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
34

45
FROM $GO_BUILDER as builder
56

7+
WORKDIR /workspace
68
COPY . .
79

810
ENV CGO_ENABLED=1
911
ENV GOEXPERIMENT=strictfipsruntime
10-
# Reset the goflags to avoid the -mod=vendor flag
11-
ENV GOFLAGS=''
12+
GOFLAGS=''
1213

1314
RUN go build -tags strictfipsruntime -o /usr/bin/main knative.dev/reconciler-test/cmd/eventshub
1415

1516
FROM $GO_RUNTIME
1617

17-
ARG VERSION=knative-v1.16
18+
ARG VERSION=
1819

1920
COPY --from=builder /usr/bin/main /usr/bin/eventshub
21+
COPY LICENSE /licenses/
2022

2123
USER 65532
2224

2325
LABEL \
24-
com.redhat.component="openshift-serverless-1-kn-plugin-event-eventshub-rhel8-container" \
25-
name="openshift-serverless-1-tech-preview/kn-plugin-event-eventshub-rhel8" \
26+
com.redhat.component="openshift-serverless-1-eventshub-rhel8-container" \
27+
name="openshift-serverless-1/eventshub-rhel8" \
2628
version=$VERSION \
27-
summary="Red Hat OpenShift Serverless 1 Kn Plugin Event Eventshub" \
29+
summary="Red Hat OpenShift Serverless 1 Eventshub" \
2830
maintainer="serverless-support@redhat.com" \
29-
description="Red Hat OpenShift Serverless 1 Kn Plugin Event Eventshub" \
30-
io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Plugin Event Eventshub" \
31-
io.k8s.description="Red Hat OpenShift Serverless Kn Plugin Event Eventshub" \
31+
description="Red Hat OpenShift Serverless 1 Eventshub" \
32+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventshub" \
33+
io.k8s.description="Red Hat OpenShift Serverless Eventshub" \
3234
io.openshift.tags="eventshub"
3335

3436
ENTRYPOINT ["/usr/bin/eventshub"]

‎openshift/ci-operator/test-images/wathola-forwarder/Dockerfile‎

100644100755
Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,36 @@
1+
# DO NOT EDIT! Generated Dockerfile for knative.dev/eventing/test/test_images/wathola-forwarder.
12
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17
23
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
34

45
FROM $GO_BUILDER as builder
56

7+
WORKDIR /workspace
68
COPY . .
79

810
ENV CGO_ENABLED=1
911
ENV GOEXPERIMENT=strictfipsruntime
10-
# Reset the goflags to avoid the -mod=vendor flag
11-
ENV GOFLAGS=''
12+
GOFLAGS=''
1213

1314
RUN go build -tags strictfipsruntime -o /usr/bin/main knative.dev/eventing/test/test_images/wathola-forwarder
1415

1516
FROM $GO_RUNTIME
1617

17-
ARG VERSION=knative-v1.16
18+
ARG VERSION=
1819

1920
COPY --from=builder /usr/bin/main /usr/bin/wathola-forwarder
21+
COPY LICENSE /licenses/
2022

2123
USER 65532
2224

2325
LABEL \
24-
com.redhat.component="openshift-serverless-1-kn-plugin-event-wathola-forwarder-rhel8-container" \
25-
name="openshift-serverless-1-tech-preview/kn-plugin-event-wathola-forwarder-rhel8" \
26+
com.redhat.component="openshift-serverless-1-knative.dev-eventing-test-test-images-wathola-forwarder-rhel8-container" \
27+
name="openshift-serverless-1/knative.dev-eventing-test-test-images-wathola-forwarder-rhel8" \
2628
version=$VERSION \
27-
summary="Red Hat OpenShift Serverless 1 Kn Plugin Event Wathola Forwarder" \
29+
summary="Red Hat OpenShift Serverless 1 Knative.Dev Eventing Test Test Images Wathola Forwarder" \
2830
maintainer="serverless-support@redhat.com" \
29-
description="Red Hat OpenShift Serverless 1 Kn Plugin Event Wathola Forwarder" \
30-
io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn Plugin Event Wathola Forwarder" \
31-
io.k8s.description="Red Hat OpenShift Serverless Kn Plugin Event Wathola Forwarder" \
32-
io.openshift.tags="wathola-forwarder"
31+
description="Red Hat OpenShift Serverless 1 Knative.Dev Eventing Test Test Images Wathola Forwarder" \
32+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Knative.Dev Eventing Test Test Images Wathola Forwarder" \
33+
io.k8s.description="Red Hat OpenShift Serverless Knative.Dev Eventing Test Test Images Wathola Forwarder" \
34+
io.openshift.tags="knative.dev-eventing-test-test-images-wathola-forwarder"
3335

3436
ENTRYPOINT ["/usr/bin/wathola-forwarder"]

‎openshift/images.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
knative.dev/kn-plugin-event/cmd/kn-event: 'registry.ci.openshift.org/openshift/-kn-event:'
2+
knative.dev/kn-plugin-event/cmd/kn-event-sender: 'registry.ci.openshift.org/openshift/-kn-event-sender:'
3+
knative.dev/kn-plugin-event/knative.dev/eventing/test/test_images/wathola-forwarder: 'registry.ci.openshift.org/openshift/-test-wathola-forwarder:'
4+
knative.dev/kn-plugin-event/knative.dev/reconciler-test/cmd/eventshub: 'registry.ci.openshift.org/openshift/-test-eventshub:'

0 commit comments

Comments
 (0)