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] Updating 7, 7-slim and 7-slim-fips for ELSA-2024-5076 ELSA-2024-12730 #17729

Merged
merged 1 commit into from
Oct 16, 2024

Conversation

amsteinb-orcl
Copy link
Contributor

This comment has been minimized.

@amsteinb-orcl
Copy link
Contributor Author

This will need to be pushed again. The aarch64 tarballs got dropped.

Copy link

Diff for e801bef:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 41c5489..9635fa4 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,9 +1,9 @@
 Maintainers: Oracle Linux Product Team <[email protected]> (@Oracle)
 GitRepo: https://github.com/oracle/container-images.git
 GitCommit: 5c8a1c296acd6e90487cd261d16cf85fd6bcb73f
-amd64-GitCommit: ff71c2bef14fafee24b8c7a8c71a3cc266b6d424
+amd64-GitCommit: b1d5a1b29292865ed0b5ba26ff6a024935b8d65b
 amd64-GitFetch: refs/heads/dist-amd64
-arm64v8-GitCommit: a826858c848d3552d502db0d0093afd7ff5f4325
+arm64v8-GitCommit: d748cd4f97446020aa5b73c9eaaf11af124ebf5c
 arm64v8-GitFetch: refs/heads/dist-arm64v8
 
 Tags: 7-slim
diff --git a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz
index eecd650..309007d 100644
Binary files a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz and b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz differ
diff --git a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t' b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t'
index 73457d3..d1f86e1 100644
--- a/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7-slim-fips/oraclelinux-7-slim-fips-amd64-rootfs.tar.xz  'tar -t'	
@@ -5223,6 +5223,7 @@ usr/share/dbus-1/system.conf
 usr/share/desktop-directories/
 usr/share/dict/
 usr/share/doc/
+usr/share/doc/NOTICES.txt
 usr/share/doc/acl-2.2.51/
 usr/share/doc/acl-2.2.51/CHANGES.gz
 usr/share/doc/acl-2.2.51/COPYING
@@ -5235,8 +5236,8 @@ usr/share/doc/binutils-2.27/
 usr/share/doc/binutils-2.27/README
 usr/share/doc/bzip2-libs-1.0.6/
 usr/share/doc/bzip2-libs-1.0.6/LICENSE
-usr/share/doc/ca-certificates-2023.2.60_v7.0.306/
-usr/share/doc/ca-certificates-2023.2.60_v7.0.306/README
+usr/share/doc/ca-certificates-2024.2.69_v8.0.303/
+usr/share/doc/ca-certificates-2024.2.69_v8.0.303/README
 usr/share/doc/coreutils-8.22/
 usr/share/doc/coreutils-8.22/ABOUT-NLS
 usr/share/doc/coreutils-8.22/COPYING
@@ -5478,8 +5479,6 @@ usr/share/doc/libcap-2.22/License
 usr/share/doc/libcap-2.22/capability.notes
 usr/share/doc/libcap-ng-0.7.5/
 usr/share/doc/libcap-ng-0.7.5/COPYING.LIB
-usr/share/doc/libcom_err-1.42.9/
-usr/share/doc/libcom_err-1.42.9/COPYING
 usr/share/doc/libdb-5.3.21/
 usr/share/doc/libdb-5.3.21/LICENSE
 usr/share/doc/libdb-5.3.21/README
@@ -6243,6 +6242,8 @@ usr/share/licenses/gmp-6.0.0/COPYINGv2
 usr/share/licenses/gmp-6.0.0/COPYINGv3
 usr/share/licenses/krb5-libs-1.15.1/
 usr/share/licenses/krb5-libs-1.15.1/LICENSE
+usr/share/licenses/libcom_err-1.45.4/
+usr/share/licenses/libcom_err-1.45.4/NOTICE
 usr/share/licenses/libkcapi-1.2.0/
 usr/share/licenses/libkcapi-1.2.0/COPYING
 usr/share/licenses/libkcapi-1.2.0/COPYING.bsd
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 c32452a..a6a2218 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 9eccb44..52377a2 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'	
@@ -3863,12 +3863,13 @@ usr/share/bash-completion/completions/yummain.py
 usr/share/desktop-directories/
 usr/share/dict/
 usr/share/doc/
+usr/share/doc/NOTICES.txt
 usr/share/doc/bash-4.2.46/
 usr/share/doc/bash-4.2.46/COPYING
 usr/share/doc/bzip2-libs-1.0.6/
 usr/share/doc/bzip2-libs-1.0.6/LICENSE
-usr/share/doc/ca-certificates-2023.2.60_v7.0.306/
-usr/share/doc/ca-certificates-2023.2.60_v7.0.306/README
+usr/share/doc/ca-certificates-2024.2.69_v8.0.303/
+usr/share/doc/ca-certificates-2024.2.69_v8.0.303/README
 usr/share/doc/coreutils-8.22/
 usr/share/doc/coreutils-8.22/ABOUT-NLS
 usr/share/doc/coreutils-8.22/COPYING
@@ -4054,8 +4055,6 @@ usr/share/doc/libcap-2.22/License
 usr/share/doc/libcap-2.22/capability.notes
 usr/share/doc/libcap-ng-0.7.5/
 usr/share/doc/libcap-ng-0.7.5/COPYING.LIB
-usr/share/doc/libcom_err-1.42.9/
-usr/share/doc/libcom_err-1.42.9/COPYING
 usr/share/doc/libdb-5.3.21/
 usr/share/doc/libdb-5.3.21/LICENSE
 usr/share/doc/libdb-5.3.21/README
@@ -4610,6 +4609,8 @@ usr/share/licenses/gmp-6.0.0/COPYINGv2
 usr/share/licenses/gmp-6.0.0/COPYINGv3
 usr/share/licenses/krb5-libs-1.15.1/
 usr/share/licenses/krb5-libs-1.15.1/LICENSE
+usr/share/licenses/libcom_err-1.45.4/
+usr/share/licenses/libcom_err-1.45.4/NOTICE
 usr/share/licenses/libsemanage-2.5/
 usr/share/licenses/libsemanage-2.5/COPYING
 usr/share/licenses/libsepol-2.5/
diff --git a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz
index 7fb307e..c773801 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 1464ed9..5412534 100644
--- a/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_7/oraclelinux-7-amd64-rootfs.tar.xz  'tar -t'	
@@ -5948,6 +5948,7 @@ usr/share/dbus-1/system.conf
 usr/share/desktop-directories/
 usr/share/dict/
 usr/share/doc/
+usr/share/doc/NOTICES.txt
 usr/share/doc/acl-2.2.51/
 usr/share/doc/acl-2.2.51/CHANGES.gz
 usr/share/doc/acl-2.2.51/COPYING
@@ -5972,8 +5973,8 @@ usr/share/doc/binutils-2.27/
 usr/share/doc/binutils-2.27/README
 usr/share/doc/bzip2-libs-1.0.6/
 usr/share/doc/bzip2-libs-1.0.6/LICENSE
-usr/share/doc/ca-certificates-2023.2.60_v7.0.306/
-usr/share/doc/ca-certificates-2023.2.60_v7.0.306/README
+usr/share/doc/ca-certificates-2024.2.69_v8.0.303/
+usr/share/doc/ca-certificates-2024.2.69_v8.0.303/README
 usr/share/doc/coreutils-8.22/
 usr/share/doc/coreutils-8.22/ABOUT-NLS
 usr/share/doc/coreutils-8.22/COPYING
@@ -6267,8 +6268,6 @@ usr/share/doc/libcap-2.22/License
 usr/share/doc/libcap-2.22/capability.notes
 usr/share/doc/libcap-ng-0.7.5/
 usr/share/doc/libcap-ng-0.7.5/COPYING.LIB
-usr/share/doc/libcom_err-1.42.9/
-usr/share/doc/libcom_err-1.42.9/COPYING
 usr/share/doc/libdb-5.3.21/
 usr/share/doc/libdb-5.3.21/LICENSE
 usr/share/doc/libdb-5.3.21/README
@@ -7600,6 +7599,8 @@ usr/share/licenses/iproute-5.4.0/
 usr/share/licenses/iproute-5.4.0/COPYING
 usr/share/licenses/krb5-libs-1.15.1/
 usr/share/licenses/krb5-libs-1.15.1/LICENSE
+usr/share/licenses/libcom_err-1.45.4/
+usr/share/licenses/libcom_err-1.45.4/NOTICE
 usr/share/licenses/libfastjson-0.99.4/
 usr/share/licenses/libfastjson-0.99.4/COPYING
 usr/share/licenses/libsemanage-2.5/

Relevant Maintainers:

@amsteinb-orcl
Copy link
Contributor Author

amsteinb-orcl commented Oct 16, 2024

I fixed the OL7 arm images. I believe I have properly updated this pull request. Please let me know if you see any issues.
Ignore the closure, I just hit the wrong button.

@tianon tianon merged commit 6c5bf1d into docker-library:master Oct 16, 2024
28 checks passed
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