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

Updating oraclelinux:6 and oraclelinux:6-slim for tzdata-2020b #8942

Merged
merged 1 commit into from
Oct 22, 2020
Merged

Updating oraclelinux:6 and oraclelinux:6-slim for tzdata-2020b #8942

merged 1 commit into from
Oct 22, 2020

Conversation

Djelibeybi
Copy link
Contributor

This is the update for oraclelinux:6 and oraclelinux:6-slim for the latest tzdata-2020b update. See ELBA-2020-4282 for details.

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

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

Diff for da1d86b:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d351c8b..bc5f6e1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Oracle Linux Product Team <ol-ovm-info_ww@oracle.com> (@Oracle)
 GitRepo: https://github.com/oracle/container-images.git
 GitCommit: 01a15ec99c7470a3391c691509db1759b41eaf66
-amd64-GitCommit: 6d8a0ddd6c2f36761853dfdc303a1d8309f69252
+amd64-GitCommit: 10227d1a88809f983e79edde3f6c3875a6e3409a
 amd64-GitFetch: refs/heads/dist-amd64
 arm64v8-GitCommit: 67d1a557e35e5e579899c13cf9257e97ec8bc7c0
 arm64v8-GitFetch: refs/heads/dist-arm64v8
diff --git a/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz b/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz
index cc68301..03ca55e 100644
Binary files a/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz and b/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz  'tar -t'
index 3da9fb6..ff3015b 100644
--- a/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_6-slim/oraclelinux-6-slim-amd64-rootfs.tar.xz  'tar -t'	
@@ -5436,7 +5436,6 @@ usr/share/zoneinfo/US/Indiana-Starke
 usr/share/zoneinfo/US/Michigan
 usr/share/zoneinfo/US/Mountain
 usr/share/zoneinfo/US/Pacific
-usr/share/zoneinfo/US/Pacific-New
 usr/share/zoneinfo/US/Samoa
 usr/share/zoneinfo/UTC
 usr/share/zoneinfo/Universal
@@ -6053,7 +6052,6 @@ usr/share/zoneinfo/posix/US/Indiana-Starke
 usr/share/zoneinfo/posix/US/Michigan
 usr/share/zoneinfo/posix/US/Mountain
 usr/share/zoneinfo/posix/US/Pacific
-usr/share/zoneinfo/posix/US/Pacific-New
 usr/share/zoneinfo/posix/US/Samoa
 usr/share/zoneinfo/posix/UTC
 usr/share/zoneinfo/posix/Universal
@@ -6669,7 +6667,6 @@ usr/share/zoneinfo/right/US/Indiana-Starke
 usr/share/zoneinfo/right/US/Michigan
 usr/share/zoneinfo/right/US/Mountain
 usr/share/zoneinfo/right/US/Pacific
-usr/share/zoneinfo/right/US/Pacific-New
 usr/share/zoneinfo/right/US/Samoa
 usr/share/zoneinfo/right/UTC
 usr/share/zoneinfo/right/Universal
diff --git a/oraclelinux_6/Dockerfile b/oraclelinux_6/Dockerfile
index d487ee1..5f58e6d 100644
--- a/oraclelinux_6/Dockerfile
+++ b/oraclelinux_6/Dockerfile
@@ -8,7 +8,7 @@ LABEL "org.opencontainers.image.authors"="Oracle Linux Product Team <ol-ovm-info
       operating system available under the GNU General Public License (GPLv2) and \
       is suitable for both general purpose or Oracle workloads."
 
-ADD oraclelinux-6.10-amd64-rootfs.tar.xz /
+ADD oraclelinux-6-amd64-rootfs.tar.xz /
 
 # overwrite this with 'CMD []' in a dependent Dockerfile
 CMD ["/bin/bash"]
diff --git a/oraclelinux_6/oraclelinux-6.10-amd64-rootfs.tar.xz b/oraclelinux_6/oraclelinux-6-amd64-rootfs.tar.xz
similarity index 79%
rename from oraclelinux_6/oraclelinux-6.10-amd64-rootfs.tar.xz
rename to oraclelinux_6/oraclelinux-6-amd64-rootfs.tar.xz
index 3700270..fc0033b 100644
Binary files a/oraclelinux_6/oraclelinux-6.10-amd64-rootfs.tar.xz and b/oraclelinux_6/oraclelinux-6-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_6/oraclelinux-6.10-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_6/oraclelinux-6-amd64-rootfs.tar.xz  'tar -t'
similarity index 99%
rename from oraclelinux_6/oraclelinux-6.10-amd64-rootfs.tar.xz  'tar -t'
rename to oraclelinux_6/oraclelinux-6-amd64-rootfs.tar.xz  'tar -t'
index cebfe27..a88d44b 100644
--- a/oraclelinux_6/oraclelinux-6.10-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_6/oraclelinux-6-amd64-rootfs.tar.xz  'tar -t'	
@@ -7205,7 +7205,6 @@ usr/share/zoneinfo/US/Indiana-Starke
 usr/share/zoneinfo/US/Michigan
 usr/share/zoneinfo/US/Mountain
 usr/share/zoneinfo/US/Pacific
-usr/share/zoneinfo/US/Pacific-New
 usr/share/zoneinfo/US/Samoa
 usr/share/zoneinfo/UTC
 usr/share/zoneinfo/Universal
@@ -7822,7 +7821,6 @@ usr/share/zoneinfo/posix/US/Indiana-Starke
 usr/share/zoneinfo/posix/US/Michigan
 usr/share/zoneinfo/posix/US/Mountain
 usr/share/zoneinfo/posix/US/Pacific
-usr/share/zoneinfo/posix/US/Pacific-New
 usr/share/zoneinfo/posix/US/Samoa
 usr/share/zoneinfo/posix/UTC
 usr/share/zoneinfo/posix/Universal
@@ -8438,7 +8436,6 @@ usr/share/zoneinfo/right/US/Indiana-Starke
 usr/share/zoneinfo/right/US/Michigan
 usr/share/zoneinfo/right/US/Mountain
 usr/share/zoneinfo/right/US/Pacific
-usr/share/zoneinfo/right/US/Pacific-New
 usr/share/zoneinfo/right/US/Samoa
 usr/share/zoneinfo/right/UTC
 usr/share/zoneinfo/right/Universal

@yosifkit yosifkit merged commit adf2d57 into docker-library:master Oct 22, 2020
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