Skip to content

Commit

Permalink
Merge pull request cockroachdb#115170 from cockroachdb/blathers/backp…
Browse files Browse the repository at this point in the history
…ort-release-23.2-115161

release-23.2: docker: temporarily use curl to install tzdata
  • Loading branch information
rail authored Nov 28, 2023
2 parents baeac6c + 0523975 commit 21196cf
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions build/deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ ARG fips_enabled
# files in /usr/share/zoneinfo/
# hostname - used in cockroach k8s manifests
# tar - used by kubectl cp
# TODO(rail): remove the temporary tzdata download hack
RUN microdnf update -y \
&& rpm --erase --nodeps tzdata \
&& curl -o /tmp/tzdata-2023c-1.el9.noarch.rpm https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/t/tzdata-2023c-1.el9.noarch.rpm https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/x86_64/baseos/os/Packages/t/tzdata-2023c-1.el9.noarch.rpm \
&& rpm -i /tmp/tzdata-2023c-1.el9.noarch.rpm \
&& rm -f /tmp/tzdata-2023c-1.el9.noarch.rpm \
&& microdnf install tzdata hostname tar gzip xz -y \
&& rm -rf /var/cache/yum
# FIPS mode requires the `openssl` package installed. Also we need to temporarily
Expand Down

0 comments on commit 21196cf

Please sign in to comment.