Skip to content

Commit faf2f11

Browse files
creydrcreydr
authored
[release-v1.14] Install tzdata (#944)
* Install tzdata in Dockerfiles * Run generate.sh
1 parent 21b9f93 commit faf2f11

File tree

29 files changed

+685
-307
lines changed

29 files changed

+685
-307
lines changed

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
# DO NOT EDIT! Generated Dockerfile.
22

3+
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
4+
35
# Dockerfile to bootstrap build and test in openshift-ci
46
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
57

6-
RUN echo "[kubernetes]" >> /etc/yum.repos.d/kubernetes.repo && \
7-
echo "name=Kubernetes" >> /etc/yum.repos.d/kubernetes.repo && \
8-
echo "baseurl=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/" >> /etc/yum.repos.d/kubernetes.repo && \
9-
echo "enabled=1" >> /etc/yum.repos.d/kubernetes.repo && \
10-
echo "gpgcheck=1" >> /etc/yum.repos.d/kubernetes.repo && \
11-
echo "gpgkey=https://pkgs.k8s.io/core:/stable:/v1.29/rpm/repodata/repomd.xml.key" >> /etc/yum.repos.d/kubernetes.repo
8+
ARG TARGETARCH
9+
10+
COPY --from=tools /usr/share/openshift/linux_$TARGETARCH/oc.rhel8 /usr/bin/oc
1211

13-
RUN yum install -y kubectl httpd-tools
12+
RUN ln -s /usr/bin/oc /usr/bin/kubectl
13+
14+
RUN yum install -y httpd-tools
1415

1516
RUN wget https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 && \
1617
chmod 700 ./get-helm-3
1718

1819
RUN ./get-helm-3 --version v3.11.3 --no-sudo && helm version
1920

2021
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]
2123

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

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/apiserver_receive_adapter.
2-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
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
36

47
COPY . .
58

6-
RUN mkdir -p /var/run/ko && \
7-
mkdir -p cmd/apiserver_receive_adapter/kodata && \
8-
go build -o /usr/bin/main ./cmd/apiserver_receive_adapter && \
9-
cp -r cmd/apiserver_receive_adapter/kodata /var/run/ko
9+
ENV CGO_ENABLED=1
10+
ENV GOEXPERIMENT=strictfipsruntime
11+
12+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/apiserver_receive_adapter
1013

11-
FROM registry.access.redhat.com/ubi8/ubi-minimal
14+
FROM $GO_RUNTIME
1215

13-
# install the missing zoneinfo to ubi-minimal
14-
RUN microdnf install tzdata
16+
ARG VERSION=knative-v1.14
17+
RUN microdnf update tzdata -y && microdnf reinstall tzdata -y
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/apiserver_receive_adapter
1520

1621
USER 65532
1722

18-
COPY --from=builder /usr/bin/main /usr/bin/main
19-
COPY --from=builder /var/run/ko /var/run/ko
20-
ENTRYPOINT ["/usr/bin/main"]
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-apiserver-receive-adapter-rhel8-container" \
25+
name="openshift-serverless-1/eventing-apiserver-receive-adapter-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Apiserver Receive Adapter" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing Apiserver Receive Adapter" \
32+
io.openshift.tags="apiserver-receive-adapter"
33+
34+
ENTRYPOINT ["/usr/bin/apiserver_receive_adapter"]

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/appender.
2-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
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
36

47
COPY . .
58

6-
RUN mkdir -p /var/run/ko && \
7-
mkdir -p cmd/appender/kodata && \
8-
go build -o /usr/bin/main ./cmd/appender && \
9-
cp -r cmd/appender/kodata /var/run/ko
9+
ENV CGO_ENABLED=1
10+
ENV GOEXPERIMENT=strictfipsruntime
11+
12+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/appender
1013

11-
FROM registry.access.redhat.com/ubi8/ubi-minimal
14+
FROM $GO_RUNTIME
1215

13-
# install the missing zoneinfo to ubi-minimal
14-
RUN microdnf install tzdata
16+
ARG VERSION=knative-v1.14
17+
RUN microdnf update tzdata -y && microdnf reinstall tzdata -y
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/appender
1520

1621
USER 65532
1722

18-
COPY --from=builder /usr/bin/main /usr/bin/main
19-
COPY --from=builder /var/run/ko /var/run/ko
20-
ENTRYPOINT ["/usr/bin/main"]
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-appender-rhel8-container" \
25+
name="openshift-serverless-1/eventing-appender-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing Appender" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing Appender" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Appender" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing Appender" \
32+
io.openshift.tags="appender"
33+
34+
ENTRYPOINT ["/usr/bin/appender"]

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_controller.
2-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
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
36

47
COPY . .
58

6-
RUN mkdir -p /var/run/ko && \
7-
mkdir -p cmd/in_memory/channel_controller/kodata && \
8-
go build -o /usr/bin/main ./cmd/in_memory/channel_controller && \
9-
cp -r cmd/in_memory/channel_controller/kodata /var/run/ko
9+
ENV CGO_ENABLED=1
10+
ENV GOEXPERIMENT=strictfipsruntime
11+
12+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/in_memory/channel_controller
1013

11-
FROM registry.access.redhat.com/ubi8/ubi-minimal
14+
FROM $GO_RUNTIME
1215

13-
# install the missing zoneinfo to ubi-minimal
14-
RUN microdnf install tzdata
16+
ARG VERSION=knative-v1.14
17+
RUN microdnf update tzdata -y && microdnf reinstall tzdata -y
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/channel_controller
1520

1621
USER 65532
1722

18-
COPY --from=builder /usr/bin/main /usr/bin/main
19-
COPY --from=builder /var/run/ko /var/run/ko
20-
ENTRYPOINT ["/usr/bin/main"]
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-controller-rhel8-container" \
25+
name="openshift-serverless-1/eventing-in-memory-channel-controller-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Controller" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Controller" \
32+
io.openshift.tags="in-memory-channel-controller"
33+
34+
ENTRYPOINT ["/usr/bin/channel_controller"]

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/in_memory/channel_dispatcher.
2-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
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
36

47
COPY . .
58

6-
RUN mkdir -p /var/run/ko && \
7-
mkdir -p cmd/in_memory/channel_dispatcher/kodata && \
8-
go build -o /usr/bin/main ./cmd/in_memory/channel_dispatcher && \
9-
cp -r cmd/in_memory/channel_dispatcher/kodata /var/run/ko
9+
ENV CGO_ENABLED=1
10+
ENV GOEXPERIMENT=strictfipsruntime
11+
12+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/in_memory/channel_dispatcher
1013

11-
FROM registry.access.redhat.com/ubi8/ubi-minimal
14+
FROM $GO_RUNTIME
1215

13-
# install the missing zoneinfo to ubi-minimal
14-
RUN microdnf install tzdata
16+
ARG VERSION=knative-v1.14
17+
RUN microdnf update tzdata -y && microdnf reinstall tzdata -y
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/channel_dispatcher
1520

1621
USER 65532
1722

18-
COPY --from=builder /usr/bin/main /usr/bin/main
19-
COPY --from=builder /var/run/ko /var/run/ko
20-
ENTRYPOINT ["/usr/bin/main"]
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-in-memory-channel-dispatcher-rhel8-container" \
25+
name="openshift-serverless-1/eventing-in-memory-channel-dispatcher-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing In Memory Channel Dispatcher" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing In Memory Channel Dispatcher" \
32+
io.openshift.tags="in-memory-channel-dispatcher"
33+
34+
ENTRYPOINT ["/usr/bin/channel_dispatcher"]

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/controller.
2-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
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
36

47
COPY . .
58

6-
RUN mkdir -p /var/run/ko && \
7-
mkdir -p cmd/controller/kodata && \
8-
go build -o /usr/bin/main ./cmd/controller && \
9-
cp -r cmd/controller/kodata /var/run/ko
9+
ENV CGO_ENABLED=1
10+
ENV GOEXPERIMENT=strictfipsruntime
11+
12+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/controller
1013

11-
FROM registry.access.redhat.com/ubi8/ubi-minimal
14+
FROM $GO_RUNTIME
1215

13-
# install the missing zoneinfo to ubi-minimal
14-
RUN microdnf install tzdata
16+
ARG VERSION=knative-v1.14
17+
RUN microdnf update tzdata -y && microdnf reinstall tzdata -y
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/controller
1520

1621
USER 65532
1722

18-
COPY --from=builder /usr/bin/main /usr/bin/main
19-
COPY --from=builder /var/run/ko /var/run/ko
20-
ENTRYPOINT ["/usr/bin/main"]
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-controller-rhel8-container" \
25+
name="openshift-serverless-1/eventing-controller-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing Controller" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing Controller" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Controller" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing Controller" \
32+
io.openshift.tags="controller"
33+
34+
ENTRYPOINT ["/usr/bin/controller"]

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/event_display.
2-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
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
36

47
COPY . .
58

6-
RUN mkdir -p /var/run/ko && \
7-
mkdir -p cmd/event_display/kodata && \
8-
go build -o /usr/bin/main ./cmd/event_display && \
9-
cp -r cmd/event_display/kodata /var/run/ko
9+
ENV CGO_ENABLED=1
10+
ENV GOEXPERIMENT=strictfipsruntime
11+
12+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/event_display
1013

11-
FROM registry.access.redhat.com/ubi8/ubi-minimal
14+
FROM $GO_RUNTIME
1215

13-
# install the missing zoneinfo to ubi-minimal
14-
RUN microdnf install tzdata
16+
ARG VERSION=knative-v1.14
17+
RUN microdnf update tzdata -y && microdnf reinstall tzdata -y
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/event_display
1520

1621
USER 65532
1722

18-
COPY --from=builder /usr/bin/main /usr/bin/main
19-
COPY --from=builder /var/run/ko /var/run/ko
20-
ENTRYPOINT ["/usr/bin/main"]
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-event-display-rhel8-container" \
25+
name="openshift-serverless-1/eventing-event-display-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing Event Display" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing Event Display" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Event Display" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing Event Display" \
32+
io.openshift.tags="event-display"
33+
34+
ENTRYPOINT ["/usr/bin/event_display"]

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

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,34 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/broker/filter.
2-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17 as builder
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
36

47
COPY . .
58

6-
RUN mkdir -p /var/run/ko && \
7-
mkdir -p cmd/broker/filter/kodata && \
8-
go build -o /usr/bin/main ./cmd/broker/filter && \
9-
cp -r cmd/broker/filter/kodata /var/run/ko
9+
ENV CGO_ENABLED=1
10+
ENV GOEXPERIMENT=strictfipsruntime
11+
12+
RUN go build -tags strictfipsruntime -o /usr/bin/main ./cmd/broker/filter
1013

11-
FROM registry.access.redhat.com/ubi8/ubi-minimal
14+
FROM $GO_RUNTIME
1215

13-
# install the missing zoneinfo to ubi-minimal
14-
RUN microdnf install tzdata
16+
ARG VERSION=knative-v1.14
17+
RUN microdnf update tzdata -y && microdnf reinstall tzdata -y
18+
19+
COPY --from=builder /usr/bin/main /usr/bin/filter
1520

1621
USER 65532
1722

18-
COPY --from=builder /usr/bin/main /usr/bin/main
19-
COPY --from=builder /var/run/ko /var/run/ko
20-
ENTRYPOINT ["/usr/bin/main"]
23+
LABEL \
24+
com.redhat.component="openshift-serverless-1-eventing-broker-filter-rhel8-container" \
25+
name="openshift-serverless-1/eventing-broker-filter-rhel8" \
26+
version=$VERSION \
27+
summary="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
28+
maintainer="[email protected]" \
29+
description="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
30+
io.k8s.display-name="Red Hat OpenShift Serverless 1 Eventing Broker Filter" \
31+
io.k8s.description="Red Hat OpenShift Serverless Eventing Broker Filter" \
32+
io.openshift.tags="broker-filter"
33+
34+
ENTRYPOINT ["/usr/bin/filter"]

0 commit comments

Comments
 (0)