Skip to content

Commit 865085b

Browse files
author
serverless-qe
committed
Generate dockerfiles with "make generate-release"
1 parent 147ccc2 commit 865085b

File tree

3 files changed

+18
-25
lines changed

3 files changed

+18
-25
lines changed

openshift/ci-operator/build-image/kubernetes.repo

Lines changed: 0 additions & 6 deletions
This file was deleted.

openshift/ci-operator/knative-images/kn/Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,30 +9,30 @@ COPY . .
99

1010
ENV CGO_ENABLED=1
1111
ENV GOEXPERIMENT=strictfipsruntime
12-
ENV GOFLAGS=''
12+
ENV GOFLAGS='-mod=mod'
1313

14-
ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:0ae40d26e834e208d0909b90fb3a37c3feb38a299034b5086f1bec69d6719eb2
15-
ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:58e3ccea5c558575fe4adc6f5f6d570ebec0934de1ba1110bc32fe76fb379c7e
14+
ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:d5f49cc564427e52c796d1ed64b00d2f62ce6c47b1624a2e06e658b87c3ac3dd
15+
ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:3f6b47431a38ca5c518c0105ad2f79b92f3067f5c7e56c5e46bd13eb1e9982de
1616
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn
1717

1818
FROM $GO_RUNTIME
1919

20-
ARG VERSION=knative-v1.19
20+
ARG VERSION=
2121

2222
COPY --from=builder /usr/bin/main /ko-app/kn
2323
COPY LICENSE /licenses/
2424

2525
USER 65532
2626

2727
LABEL \
28-
com.redhat.component="openshift-serverless-1-client-kn-rhel8-container" \
29-
name="openshift-serverless-1/client-kn-rhel8" \
28+
com.redhat.component="openshift-serverless-1-kn-rhel8-container" \
29+
name="openshift-serverless-1/kn-rhel8" \
3030
version=$VERSION \
31-
summary="Red Hat OpenShift Serverless 1 Client Kn" \
31+
summary="Red Hat OpenShift Serverless 1 Kn" \
3232
maintainer="[email protected]" \
33-
description="Red Hat OpenShift Serverless 1 Client Kn" \
34-
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Kn" \
35-
io.k8s.description="Red Hat OpenShift Serverless Client Kn" \
33+
description="Red Hat OpenShift Serverless 1 Kn" \
34+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Kn" \
35+
io.k8s.description="Red Hat OpenShift Serverless Kn" \
3636
io.openshift.tags="kn"
3737

3838
ENTRYPOINT ["/ko-app/kn"]

openshift/ci-operator/knative-test-images/helloworld/Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,28 @@ COPY . .
99

1010
ENV CGO_ENABLED=1
1111
ENV GOEXPERIMENT=strictfipsruntime
12-
ENV GOFLAGS=''
12+
ENV GOFLAGS='-mod=mod'
1313

14-
RUN GOWORK=off go mod vendor
1514
RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/helloworld
1615

1716
FROM $GO_RUNTIME
1817

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

2120
COPY --from=builder /usr/bin/main /ko-app/helloworld
2221
COPY LICENSE /licenses/
2322

2423
USER 65532
2524

2625
LABEL \
27-
com.redhat.component="openshift-serverless-1-client-test-test-images-helloworld-rhel8-container" \
28-
name="openshift-serverless-1/client-test-test-images-helloworld-rhel8" \
26+
com.redhat.component="openshift-serverless-1-test-test-images-helloworld-rhel8-container" \
27+
name="openshift-serverless-1/test-test-images-helloworld-rhel8" \
2928
version=$VERSION \
30-
summary="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
29+
summary="Red Hat OpenShift Serverless 1 Test Test Images Helloworld" \
3130
maintainer="[email protected]" \
32-
description="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
33-
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
34-
io.k8s.description="Red Hat OpenShift Serverless Client Test Test Images Helloworld" \
31+
description="Red Hat OpenShift Serverless 1 Test Test Images Helloworld" \
32+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Test Test Images Helloworld" \
33+
io.k8s.description="Red Hat OpenShift Serverless Test Test Images Helloworld" \
3534
io.openshift.tags="test-test-images-helloworld"
3635

3736
ENTRYPOINT ["/ko-app/helloworld"]

0 commit comments

Comments
 (0)