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 Oracle Linux 6 and 7 images for amd64 #7177

Merged
merged 1 commit into from
Dec 20, 2019
Merged

Updating Oracle Linux 6 and 7 images for amd64 #7177

merged 1 commit into from
Dec 20, 2019

Conversation

Djelibeybi
Copy link
Contributor

Updating 6, 6.10 and 6-slim
Updating 7, 7.7 and 7-slim

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

Signed-off-by: Avi Miller <me@dje.li>
@yosifkit
Copy link
Member

Diff:
diff --git a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz
index ea58e4a..1ab64a7 100644
Binary files a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz and b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz differ
diff --git a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz  'tar -t' b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz  'tar -t'
index f7456c4..4466d3f 100644
--- a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz  'tar -t'	
@@ -631,6 +631,7 @@ usr/bin/nl
 usr/bin/nohup
 usr/bin/nproc
 usr/bin/nroff
+usr/bin/nss-policy-check
 usr/bin/od
 usr/bin/openssl
 usr/bin/p11-kit
diff --git a/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz b/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz
index 53e1bd6..206e657 100644
Binary files a/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz and b/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz differ
diff --git a/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz  'tar -t' b/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz  'tar -t'
index a6bdf6c..ec6fd9e 100644
--- a/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz  'tar -t'	
@@ -1461,6 +1461,7 @@ usr/bin/nohup
 usr/bin/nproc
 usr/bin/nroff
 usr/bin/nsenter
+usr/bin/nss-policy-check
 usr/bin/objcopy
 usr/bin/objdump
 usr/bin/od
@@ -1922,7 +1923,7 @@ usr/lib64/krb5/plugins/authdata/
 usr/lib64/krb5/plugins/kdb/
 usr/lib64/krb5/plugins/libkrb5/
 usr/lib64/krb5/plugins/preauth/
-usr/lib64/libbfd-2.20.51.0.2-5.48.el6_10.1.so
+usr/lib64/libbfd-2.20.51.0.2-5.48.0.1.el6_10.1.so
 usr/lib64/libcrack.so.2
 usr/lib64/libcrack.so.2.8.1
 usr/lib64/libcrypto.so.10
@@ -2003,7 +2004,7 @@ usr/lib64/libnssdbm3.so
 usr/lib64/libnsspem.so
 usr/lib64/libnsssysinit.so
 usr/lib64/libnssutil3.so
-usr/lib64/libopcodes-2.20.51.0.2-5.48.el6_10.1.so
+usr/lib64/libopcodes-2.20.51.0.2-5.48.0.1.el6_10.1.so
 usr/lib64/libp11-kit.so.0
 usr/lib64/libp11-kit.so.0.0.0
 usr/lib64/libpanel.so.5
diff --git a/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz b/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz
index 2e8912b..a740699 100644
Binary files a/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz and b/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz differ
diff --git a/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz b/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz
index 90979b3..8309e0f 100644
Binary files a/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz and b/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz differ
diff --git a/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz  'tar -t' b/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz  'tar -t'
index e943e08..42ba275 100644
--- a/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz  'tar -t'	
+++ b/oraclelinux_latest/oraclelinux-7.7-rootfs.tar.xz  'tar -t'	
@@ -384,6 +384,7 @@ etc/systemd/bootchart.conf
 etc/systemd/coredump.conf
 etc/systemd/journald.conf
 etc/systemd/logind.conf
+etc/systemd/pstore.conf
 etc/systemd/system/
 etc/systemd/system/basic.target.wants/
 etc/systemd/system/basic.target.wants/rhel-dmesg.service
@@ -1320,7 +1321,7 @@ usr/lib64/libaudit.so.1
 usr/lib64/libaudit.so.1.0.0
 usr/lib64/libauparse.so.0
 usr/lib64/libauparse.so.0.0.0
-usr/lib64/libbfd-2.27-41.base.0.1.el7.so
+usr/lib64/libbfd-2.27-41.base.0.3.el7_7.1.so
 usr/lib64/libblkid.so.1
 usr/lib64/libblkid.so.1.1.0
 usr/lib64/libBrokenLocale-2.17.so
@@ -1507,7 +1508,7 @@ usr/lib64/libnsssysinit.so
 usr/lib64/libnssutil3.so
 usr/lib64/libomapi.so.0
 usr/lib64/libomapi.so.0.0.0
-usr/lib64/libopcodes-2.27-41.base.0.1.el7.so
+usr/lib64/libopcodes-2.27-41.base.0.3.el7_7.1.so
 usr/lib64/libp11-kit.so.0
 usr/lib64/libp11-kit.so.0.3.0
 usr/lib64/libpamc.so.0
@@ -5094,6 +5095,7 @@ usr/lib/systemd/systemd-logind
 usr/lib/systemd/systemd-machined
 usr/lib/systemd/systemd-machine-id-commit
 usr/lib/systemd/systemd-modules-load
+usr/lib/systemd/systemd-pstore
 usr/lib/systemd/systemd-pull
 usr/lib/systemd/systemd-quotacheck
 usr/lib/systemd/system/dracut-cmdline.service
@@ -5322,6 +5324,7 @@ usr/lib/systemd/system/systemd-machine-id-commit.service
 usr/lib/systemd/system/systemd-modules-load.service
 usr/lib/systemd/system/systemd-nspawn@.service
 usr/lib/systemd/system/systemd-poweroff.service
+usr/lib/systemd/system/systemd-pstore.service
 usr/lib/systemd/system/systemd-quotacheck.service
 usr/lib/systemd/system/systemd-random-seed.service
 usr/lib/systemd/system/systemd-readahead-collect.service

@yosifkit
Copy link
Member

Build test of #7177; 576518b; amd64 (oraclelinux):

$ bashbrew build oraclelinux:8.0
Building bashbrew/cache:e25ab61f4653372bce329c62eaec46d1ed3dc41ca38bf23bdcd443a7395f634f (oraclelinux:8.0)
Tagging oraclelinux:8.0
Tagging oraclelinux:8

$ test/run.sh oraclelinux:8.0
testing oraclelinux:8.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:8-slim
Building bashbrew/cache:fad20f7218d6af9159b8906af776fd6611daf90028a2df4eece52f5217009f08 (oraclelinux:8-slim)
Tagging oraclelinux:8-slim

$ test/run.sh oraclelinux:8-slim
testing oraclelinux:8-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:7.7
Building bashbrew/cache:56288e3bde5414c3f11eeda08a4a7dc48232d186214fccf8cbe98ebdcb76d533 (oraclelinux:7.7)
Tagging oraclelinux:7.7
Tagging oraclelinux:7
Tagging oraclelinux:latest

$ test/run.sh oraclelinux:7.7
testing oraclelinux:7.7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:7-slim
Building bashbrew/cache:4f7be5c8bbe1bbf8fe6b46b4bc6f22874cda0e9657854d3a8e2f8ad9464eed9f (oraclelinux:7-slim)
Tagging oraclelinux:7-slim

$ test/run.sh oraclelinux:7-slim
testing oraclelinux:7-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6.10
Building bashbrew/cache:a57d6b6796013272eef6dc8050efd07c56f1977d486fa5625cb1389ced0bb53e (oraclelinux:6.10)
Tagging oraclelinux:6.10
Tagging oraclelinux:6

$ test/run.sh oraclelinux:6.10
testing oraclelinux:6.10
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6-slim
Building bashbrew/cache:7b001ca585e6368c7c5247af6f8d7f713ac5c71946734edd41675f380f8c7be9 (oraclelinux:6-slim)
Tagging oraclelinux:6-slim

$ test/run.sh oraclelinux:6-slim
testing oraclelinux:6-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit 68a9521 into docker-library:master Dec 20, 2019
@Djelibeybi Djelibeybi deleted the update-ol branch January 30, 2020 21:27
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.

3 participants