Skip to content

Commit ddcdae2

Browse files
dsimanskdsimansk
committed
Update generated dockerfiles
1 parent f03c851 commit ddcdae2

File tree

14 files changed

+264
-60
lines changed

14 files changed

+264
-60
lines changed

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

100644100755
Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
1-
# Copyright 2019 The OpenShift Knative Authors
2-
#
3-
# Licensed under the Apache License, Version 2.0 (the "License");
4-
# you may not use this file except in compliance with the License.
5-
# You may obtain a copy of the License at
6-
#
7-
# http://www.apache.org/licenses/LICENSE-2.0
8-
#
9-
# Unless required by applicable law or agreed to in writing, software
10-
# distributed under the License is distributed on an "AS IS" BASIS,
11-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
# See the License for the specific language governing permissions and
13-
# limitations under the License.
1+
# DO NOT EDIT! Generated Dockerfile.
2+
3+
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
144

155
# Dockerfile to bootstrap build and test in openshift-ci
166
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
177

18-
# Add kubernetes repository
19-
ADD openshift/ci-operator/build-image/kubernetes.repo /etc/yum.repos.d/
8+
ARG TARGETARCH
9+
10+
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
11+
12+
RUN ln -s /usr/bin/oc /usr/bin/kubectl
13+
14+
RUN yum install -y httpd-tools
15+
16+
RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
17+
chmod 700 ./get-helm-3
18+
19+
RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version
2020

21-
RUN yum install -y kubectl httpd-tools
21+
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/[email protected]
2223

23-
# Allow runtime users to add entries to /etc/passwd
24-
RUN chmod g+rw /etc/passwd
24+
# go install creates $GOPATH/.cache with root permissions, we delete it here
25+
# to avoid permission issues with the runtime users
26+
RUN rm -rf $GOPATH/.cache

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

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

‎openshift/ci-operator/knative-images/cli-artifacts/Dockerfile‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This is not generated Dockerfile, yet!
2+
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
3+
ARG CLI_ARTIFACTS=registry.redhat.io/openshift-serverless-1/kn-cli-artifacts-rhel8:1.15
4+
5+
FROM $CLI_ARTIFACTS as builder
6+
7+
FROM $GO_RUNTIME
8+
9+
ARG VERSION=knative-v1.17
10+
11+
RUN mkdir -p /usr/share/kn
12+
13+
COPY --from=builder /usr/share/kn /usr/share/kn
14+
COPY LICENSE /licenses/
15+
16+
USER 65532
17+
18+
LABEL \
19+
com.redhat.component="openshift-serverless-1-client-cli-artifacts-rhel8-container" \
20+
name="openshift-serverless-1/client-cli-artifacts-rhel8" \
21+
version=$VERSION \
22+
summary="Red Hat OpenShift Serverless 1 Client Cli Artifacts" \
23+
maintainer="[email protected]" \
24+
description="Red Hat OpenShift Serverless 1 Client Cli Artifacts" \
25+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Cli Artifacts" \
26+
io.k8s.description="Red Hat OpenShift Serverless Client Cli Artifacts" \
27+
io.openshift.tags="cli-artifacts"

‎openshift/ci-operator/knative-images/client/Dockerfile‎

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

‎openshift/ci-operator/knative-images/client/Dockerfile.cliartifacts‎

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

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# DO NOT EDIT! Generated Dockerfile for cmd/kn.
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+
13+
ENV KN_PLUGIN_FUNC_UTIL_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-func-func-util-rhel8@sha256:bc3c82113b8f55720720bdba8c4357d6ba5a0c4f4597252648718c64588e9a85
14+
ENV KN_PLUGIN_EVENT_SENDER_IMAGE=registry.redhat.io/openshift-serverless-1/kn-plugin-event-sender-rhel8@sha256:08f0b4151edd6d777e2944c6364612a5599e5a775e5150a76676a45f753c2e23
15+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/kn
16+
17+
FROM $GO_RUNTIME
18+
19+
ARG VERSION=knative-v1.17
20+
21+
COPY --from=builder /usr/bin/main /ko-app/kn
22+
COPY LICENSE /licenses/
23+
24+
USER 65532
25+
26+
LABEL \
27+
com.redhat.component="openshift-serverless-1-client-kn-rhel8-container" \
28+
name="openshift-serverless-1/client-kn-rhel8" \
29+
version=$VERSION \
30+
summary="Red Hat OpenShift Serverless 1 Client Kn" \
31+
maintainer="[email protected]" \
32+
description="Red Hat OpenShift Serverless 1 Client Kn" \
33+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Kn" \
34+
io.k8s.description="Red Hat OpenShift Serverless Client Kn" \
35+
io.openshift.tags="kn"
36+
37+
ENTRYPOINT ["/ko-app/kn"]

‎openshift/ci-operator/knative-test-images/grpc-ping/Dockerfile‎

100644100755
Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
1-
FROM openshift/origin-base
1+
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/grpc-ping.
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+
13+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/serving/test/test_images/grpc-ping
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-v1.17
18+
19+
COPY --from=builder /usr/bin/main /ko-app/grpc-ping
20+
COPY LICENSE /licenses/
21+
222
USER 65532
323

4-
ADD grpc-ping /ko-app/grpc-ping
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-client-vendor-knative.dev-serving-test-test-images-grpc-ping-rhel8-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-grpc-ping-rhel8" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
32+
io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Grpc Ping" \
33+
io.openshift.tags="vendor-knative.dev-serving-test-test-images-grpc-ping"
534

6-
ENTRYPOINT ["/ko-app/grpc-ping"]
35+
ENTRYPOINT ["/ko-app/grpc-ping"]

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

100644100755
Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
1-
FROM openshift/origin-base
1+
# DO NOT EDIT! Generated Dockerfile for test/test_images/helloworld.
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+
13+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./test/test_images/helloworld
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-v1.17
18+
19+
COPY --from=builder /usr/bin/main /ko-app/helloworld
20+
COPY LICENSE /licenses/
21+
222
USER 65532
323

4-
ADD helloworld /ko-app/helloworld
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-client-test-test-images-helloworld-rhel8-container" \
26+
name="openshift-serverless-1/client-test-test-images-helloworld-rhel8" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Test Test Images Helloworld" \
32+
io.k8s.description="Red Hat OpenShift Serverless Client Test Test Images Helloworld" \
33+
io.openshift.tags="test-test-images-helloworld"
534

6-
ENTRYPOINT ["/ko-app/helloworld"]
35+
ENTRYPOINT ["/ko-app/helloworld"]

‎openshift/ci-operator/knative-test-images/servingcontainer/Dockerfile‎

100644100755
Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
1-
# Do not edit! This file was generated via Makefile
2-
FROM openshift/origin-base
1+
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/multicontainer/servingcontainer.
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+
13+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/serving/test/test_images/multicontainer/servingcontainer
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-v1.17
18+
19+
COPY --from=builder /usr/bin/main /ko-app/servingcontainer
20+
COPY LICENSE /licenses/
21+
322
USER 65532
423

5-
ADD servingcontainer /ko-app/servingcontainer
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-client-vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer-rhel8-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer-rhel8" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
32+
io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Multicontainer Servingcontainer" \
33+
io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-servingcontainer"
34+
635
ENTRYPOINT ["/ko-app/servingcontainer"]

‎openshift/ci-operator/knative-test-images/sidecarcontainer/Dockerfile‎

100644100755
Lines changed: 32 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,35 @@
1-
# Do not edit! This file was generated via Makefile
2-
FROM openshift/origin-base
1+
# DO NOT EDIT! Generated Dockerfile for vendor/knative.dev/serving/test/test_images/multicontainer/sidecarcontainer.
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+
13+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./vendor/knative.dev/serving/test/test_images/multicontainer/sidecarcontainer
14+
15+
FROM $GO_RUNTIME
16+
17+
ARG VERSION=knative-v1.17
18+
19+
COPY --from=builder /usr/bin/main /ko-app/sidecarcontainer
20+
COPY LICENSE /licenses/
21+
322
USER 65532
423

5-
ADD sidecarcontainer /ko-app/sidecarcontainer
24+
LABEL \
25+
com.redhat.component="openshift-serverless-1-client-vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer-rhel8-container" \
26+
name="openshift-serverless-1/client-vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer-rhel8" \
27+
version=$VERSION \
28+
summary="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
29+
maintainer="[email protected]" \
30+
description="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
31+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
32+
io.k8s.description="Red Hat OpenShift Serverless Client Vendor Knative.Dev Serving Test Test Images Multicontainer Sidecarcontainer" \
33+
io.openshift.tags="vendor-knative.dev-serving-test-test-images-multicontainer-sidecarcontainer"
34+
635
ENTRYPOINT ["/ko-app/sidecarcontainer"]

0 commit comments

Comments
 (0)