Skip to content

Commit c649ffc

Browse files
authored
Merge pull request #302 from splunk/bugfix/support-tzdata-ubi
Support for tzdata in UBI redhat images
2 parents 018e15d + c1f063a commit c649ffc

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

base/redhat-8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# the container catalog moved from registry.access.redhat.com to registry.redhat.io
1717
# So at some point before they deprecate the old registry we have to make sure that
1818
# we have access to the new registry and change where we pull the ubi image from.
19-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.0-213
19+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1
2020
LABEL name="splunk" \
2121
maintainer="support@splunk.com" \
2222
vendor="splunk" \

base/redhat-8/install.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
set -e
1717

18+
# Per: https://github.com/rpm-software-management/microdnf/issues/50
19+
mkdir -p /run/user/$UID
1820
# reinstalling local en def for now, removed in minimal image https://bugzilla.redhat.com/show_bug.cgi?id=1665251
1921
microdnf -y --nodocs install glibc-langpack-en
2022

@@ -25,7 +27,8 @@ microdnf -y --nodocs install glibc-langpack-en
2527
#We get around the gen above by forcing the language install, and then point to it.
2628
export LANG=en_US.utf8
2729

28-
microdnf -y --nodocs install wget sudo shadow-utils procps tar
30+
rpm -e --nodeps tzdata
31+
microdnf -y --nodocs install wget sudo shadow-utils procps tar tzdata
2932
#install busybox direct from the multiarch since epel isn't availible yet for redhat8
3033
wget -O /bin/busybox https://busybox.net/downloads/binaries/1.28.1-defconfig-multiarch/busybox-`arch`
3134
chmod +x /bin/busybox

0 commit comments

Comments
 (0)