Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[oraclelinux] Update Oracle Linux images with new tzdata #9380

Merged
merged 1 commit into from
Jan 6, 2021
Merged

[oraclelinux] Update Oracle Linux images with new tzdata #9380

merged 1 commit into from
Jan 6, 2021

Conversation

Djelibeybi
Copy link
Contributor

See https://linux.oracle.com/errata/ELBA-2021-0013.html for details.

We've also done some minor housekeeping of the repo that holds the
archives.

Signed-off-by: Avi Miller avi.miller@oracle.com

See https://linux.oracle.com/errata/ELBA-2021-0013.html for details.
We've also done some minor housekeeping of the repo that holds the
archives.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
@github-actions
Copy link

github-actions bot commented Jan 6, 2021

Diff for 4aea969:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index f56cb9f..cf19f58 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,16 +1,16 @@
 Maintainers: Oracle Linux Product Team <ol-ovm-info_ww@oracle.com> (@Oracle)
 GitRepo: https://github.com/oracle/container-images.git
 GitCommit: 01a15ec99c7470a3391c691509db1759b41eaf66
-amd64-GitCommit: fbf2fbd291036ba1cc2b407f287bec9f547863c7
+amd64-GitCommit: 771e29f60d613a998545d5f2404e2f189f2722c5
 amd64-GitFetch: refs/heads/dist-amd64
-arm64v8-GitCommit: 7daf0e74bd152f07663479136d40b6ab26828f1e
+arm64v8-GitCommit: b3619605fbd80be098075a973ba93452d0197361
 arm64v8-GitFetch: refs/heads/dist-arm64v8
 
 Tags: 6-slim
 Directory: 6-slim
 
 Tags: 6.10, 6
-Directory: 6.10
+Directory: 6
 
 Tags: 7-slim
 Architectures: amd64, arm64v8
@@ -18,7 +18,7 @@ Directory: 7-slim
 
 Tags: 7.9, 7
 Architectures: amd64, arm64v8
-Directory: 7.9
+Directory: 7
 
 Tags: 8-slim
 Architectures: amd64, arm64v8
@@ -26,4 +26,4 @@ Directory: 8-slim
 
 Tags: 8.3, 8
 Architectures: amd64, arm64v8
-Directory: 8.3
+Directory: 8
diff --git a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz
index 0126960..a91bb35 100644
Binary files a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz and b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t'
index 7793b25..2e62117 100644
--- a/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7-slim/oraclelinux-7-slim-amd64-rootfs.tar.xz  'tar -t'	
@@ -4476,11 +4476,11 @@ usr/share/doc/shared-mime-info-1.8/README
 usr/share/doc/shared-mime-info-1.8/shared-mime-info-spec.xml
 usr/share/doc/sqlite-3.7.17/
 usr/share/doc/sqlite-3.7.17/README
-usr/share/doc/tzdata-2020d/
-usr/share/doc/tzdata-2020d/README
-usr/share/doc/tzdata-2020d/theory.html
-usr/share/doc/tzdata-2020d/tz-art.html
-usr/share/doc/tzdata-2020d/tz-link.html
+usr/share/doc/tzdata-2020f/
+usr/share/doc/tzdata-2020f/README
+usr/share/doc/tzdata-2020f/theory.html
+usr/share/doc/tzdata-2020f/tz-art.html
+usr/share/doc/tzdata-2020f/tz-link.html
 usr/share/doc/ustr-1.0.4/
 usr/share/doc/ustr-1.0.4/ChangeLog
 usr/share/doc/ustr-1.0.4/LICENSE
diff --git a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz
index 5377634..077627d 100644
Binary files a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz and b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'
index 0c10698..c3f94d7 100644
--- a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'	
@@ -7248,11 +7248,11 @@ usr/share/doc/tcp_wrappers-libs-7.6/README.IRIX
 usr/share/doc/tcp_wrappers-libs-7.6/README.NIS
 usr/share/doc/tcp_wrappers-libs-7.6/README.ipv6
 usr/share/doc/tcp_wrappers-libs-7.6/README.ipv6.2
-usr/share/doc/tzdata-2020d/
-usr/share/doc/tzdata-2020d/README
-usr/share/doc/tzdata-2020d/theory.html
-usr/share/doc/tzdata-2020d/tz-art.html
-usr/share/doc/tzdata-2020d/tz-link.html
+usr/share/doc/tzdata-2020f/
+usr/share/doc/tzdata-2020f/README
+usr/share/doc/tzdata-2020f/theory.html
+usr/share/doc/tzdata-2020f/tz-art.html
+usr/share/doc/tzdata-2020f/tz-link.html
 usr/share/doc/usermode-1.111/
 usr/share/doc/usermode-1.111/COPYING
 usr/share/doc/usermode-1.111/ChangeLog
diff --git a/oraclelinux_8-slim/oraclelinux-8-slim-amd64-rootfs.tar.xz b/oraclelinux_8-slim/oraclelinux-8-slim-amd64-rootfs.tar.xz
index e2d72fc..55b23c2 100644
Binary files a/oraclelinux_8-slim/oraclelinux-8-slim-amd64-rootfs.tar.xz and b/oraclelinux_8-slim/oraclelinux-8-slim-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_8/oraclelinux-8-amd64-rootfs.tar.xz b/oraclelinux_8/oraclelinux-8-amd64-rootfs.tar.xz
index 96677d5..08edb67 100644
Binary files a/oraclelinux_8/oraclelinux-8-amd64-rootfs.tar.xz and b/oraclelinux_8/oraclelinux-8-amd64-rootfs.tar.xz differ

@yosifkit yosifkit merged commit 26a8df7 into docker-library:master Jan 6, 2021
@Djelibeybi Djelibeybi deleted the oraclelinux-tzdata branch January 6, 2021 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants