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

update centos monthly images as of 20170605 #3020

Merged
merged 1 commit into from
Jun 5, 2017
Merged

update centos monthly images as of 20170605 #3020

merged 1 commit into from
Jun 5, 2017

Conversation

jperrin
Copy link
Contributor

@jperrin jperrin commented Jun 5, 2017

No description provided.

@yosifkit
Copy link
Member

yosifkit commented Jun 5, 2017

Diff:
diff --git a/centos_6/Dockerfile b/centos_6/Dockerfile
index a79b320..eceaf20 100644
--- a/centos_6/Dockerfile
+++ b/centos_6/Dockerfile
@@ -4,6 +4,6 @@ ADD centos-6-docker.tar.xz /
 LABEL name="CentOS Base Image" \
     vendor="CentOS" \
     license="GPLv2" \
-    build-date="20170510"
+    build-date="20170605"
 
 CMD ["/bin/bash"]
diff --git a/centos_6/centos-6-docker.tar.xz b/centos_6/centos-6-docker.tar.xz
index 5b96a3e..351e91e 100644
Binary files a/centos_6/centos-6-docker.tar.xz and b/centos_6/centos-6-docker.tar.xz differ
diff --git a/centos_6/centos-6-docker.tar.xz  'tar -t' b/centos_6/centos-6-docker.tar.xz  'tar -t'
index 85a4ff4..75f2c48 100644
--- a/centos_6/centos-6-docker.tar.xz  'tar -t'	
+++ b/centos_6/centos-6-docker.tar.xz  'tar -t'	
@@ -83,7 +83,6 @@
 ./etc/csh.login
 ./etc/dbus-1/
 ./etc/dbus-1/system.d/
-./etc/dbus-1/system.d/Upstart.conf
 ./etc/default/
 ./etc/default/nss
 ./etc/default/useradd
@@ -110,10 +109,7 @@
 ./etc/hosts
 ./etc/hosts.allow
 ./etc/hosts.deny
-./etc/init/
-./etc/init.conf
 ./etc/init.d
-./etc/init/init-system-dbus.conf
 ./etc/inputrc
 ./etc/issue
 ./etc/issue.net
@@ -489,8 +485,6 @@
 ./lib64/libselinux.so.1
 ./lib64/libsemanage.so.1
 ./lib64/libsepol.so.1
-./lib64/libss.so.2
-./lib64/libss.so.2.0
 ./lib64/libthread_db-1.0.so
 ./lib64/libthread_db.so.1
 ./lib64/libtinfo.so.5
@@ -603,10 +597,7 @@
 ./sbin/ethtool
 ./sbin/faillock
 ./sbin/fuser
-./sbin/halt
 ./sbin/ifconfig
-./sbin/init
-./sbin/initctl
 ./sbin/insmod
 ./sbin/insmod.static
 ./sbin/install-info
@@ -627,22 +618,12 @@
 ./sbin/pam_tally2
 ./sbin/pam_timestamp_check
 ./sbin/plipconfig
-./sbin/poweroff
-./sbin/reboot
-./sbin/reload
-./sbin/restart
 ./sbin/rmmod
 ./sbin/route
-./sbin/runlevel
 ./sbin/runuser
-./sbin/shutdown
 ./sbin/slattach
 ./sbin/sln
-./sbin/start
-./sbin/status
-./sbin/stop
 ./sbin/sysctl
-./sbin/telinit
 ./sbin/unix_chkpwd
 ./sbin/unix_update
 ./sbin/weak-modules
@@ -5248,7 +5229,6 @@
 ./usr/share/locale/en@boldquot/LC_MESSAGES/elfutils.mo
 ./usr/share/locale/en@boldquot/LC_MESSAGES/gnupg2.mo
 ./usr/share/locale/en@boldquot/LC_MESSAGES/libidn.mo
-./usr/share/locale/en@boldquot/LC_MESSAGES/upstart.mo
 ./usr/share/locale/en_CA/
 ./usr/share/locale/en_CA/LC_MESSAGES/
 ./usr/share/locale/en_CA/LC_MESSAGES/glib20.mo
@@ -5275,7 +5255,6 @@
 ./usr/share/locale/en@quot/LC_MESSAGES/elfutils.mo
 ./usr/share/locale/en@quot/LC_MESSAGES/gnupg2.mo
 ./usr/share/locale/en@quot/LC_MESSAGES/libidn.mo
-./usr/share/locale/en@quot/LC_MESSAGES/upstart.mo
 ./usr/share/locale/en@shaw/
 ./usr/share/locale/en@shaw/LC_MESSAGES/
 ./usr/share/locale/en@shaw/LC_MESSAGES/glib20.mo
diff --git a/centos_7/Dockerfile b/centos_7/Dockerfile
index a20c474..39a31fe 100644
--- a/centos_7/Dockerfile
+++ b/centos_7/Dockerfile
@@ -4,6 +4,6 @@ ADD centos-7-docker.tar.xz /
 LABEL name="CentOS Base Image" \
     vendor="CentOS" \
     license="GPLv2" \
-    build-date="20170510"
+    build-date="20170605"
 
 CMD ["/bin/bash"]
diff --git a/centos_7/centos-7-docker.tar.xz b/centos_7/centos-7-docker.tar.xz
index 5c89161..a038925 100644
Binary files a/centos_7/centos-7-docker.tar.xz and b/centos_7/centos-7-docker.tar.xz differ
diff --git a/centos_7/centos-7-docker.tar.xz  'tar -t' b/centos_7/centos-7-docker.tar.xz  'tar -t'
index 2bc02fe..fd29688 100644
--- a/centos_7/centos-7-docker.tar.xz  'tar -t'	
+++ b/centos_7/centos-7-docker.tar.xz  'tar -t'	
@@ -341,7 +341,7 @@
 ./tmp/
 ./tmp/.font-unix/
 ./tmp/.ICE-unix/
-./tmp/ks-script-O2SqLk
+./tmp/ks-script-3_LJly
 ./tmp/.Test-unix/
 ./tmp/.X11-unix/
 ./tmp/.XIM-unix/

@yosifkit
Copy link
Member

yosifkit commented Jun 5, 2017

Build test of #3020; 22348b8 (centos):

$ bashbrew build centos:latest
Building bashbrew/cache:57aa325aa1bd2002ea141015288b231858565d48e2d79ec8cfdf4bf015bbb77b (centos:latest)
Tagging centos:latest
Tagging centos:centos7
Tagging centos:7

$ test/run.sh centos:latest
testing centos:latest
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...warning: garbage password detected for 'root': 'locked'
passed
	'override-cmd' [4/4]...passed


$ bashbrew build centos:centos6
Building bashbrew/cache:a9cdb8a82934cadde31b36e6b1c14e5d3ea94b03fd295567449ca476d452de51 (centos:centos6)
Tagging centos:centos6
Tagging centos:6

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


$ bashbrew build centos:centos7.3.1611
Using bashbrew/cache:61622958167fbac7661e35df6ba5fc3a081d8034255f3c26105be427e250ddba (centos:centos7.3.1611)
Tagging centos:centos7.3.1611
Tagging centos:7.3.1611

$ test/run.sh centos:centos7.3.1611
testing centos:centos7.3.1611
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...warning: garbage password detected for 'root': 'locked'
passed
	'override-cmd' [4/4]...passed


$ bashbrew build centos:centos7.2.1511
Using bashbrew/cache:6e0a78389c5bef1c69207f935212b4d8d8e98d6540337a25545d85eca86e43e7 (centos:centos7.2.1511)
Tagging centos:centos7.2.1511
Tagging centos:7.2.1511

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


$ bashbrew build centos:centos7.1.1503
Using bashbrew/cache:af64f05f3de65c78d5e75ab055996c3ac6e3aec49d9001ef05032c999208e5ed (centos:centos7.1.1503)
Tagging centos:centos7.1.1503
Tagging centos:7.1.1503

$ test/run.sh centos:centos7.1.1503
testing centos:centos7.1.1503
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...error: crypt password detected for 'root': '$1$UKLtvLuY$kka6S665oCFmU7ivSDZzU.'
failed
	'override-cmd' [4/4]...passed


$ bashbrew build centos:centos7.0.1406
Using bashbrew/cache:b675060f29caa985d4069b0d7e7f5b5a123461f1e931ebc37d9f4c0cd07b0840 (centos:centos7.0.1406)
Tagging centos:centos7.0.1406
Tagging centos:7.0.1406

$ test/run.sh centos:centos7.0.1406
testing centos:centos7.0.1406
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...shellshock_test.sh: line 17:    15 Segmentation fault      shellshocker="() { x() { _;}; x() { _;} <<a; }" bash -c date 2> /dev/null
shellshock_test.sh: line 50:    32 Segmentation fault      bash -c 'true <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF <<EOF' 2> /dev/null
failed
	'no-hard-coded-passwords' [3/4]...error: crypt password detected for 'root': '$1$UKLtvLuY$kka6S665oCFmU7ivSDZzU.'
failed
	'override-cmd' [4/4]...passed


$ bashbrew build centos:centos6.9
Using bashbrew/cache:259c8c21ccd9f3f15a89b681b167965cea1c911236286c9885ad6c36e63ad722 (centos:centos6.9)
Tagging centos:centos6.9
Tagging centos:6.9

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


$ bashbrew build centos:centos6.8
Using bashbrew/cache:9775568854030068d0879e45b370be8a29524eb91c0d2fecfbbd69ba4d415a1d (centos:centos6.8)
Tagging centos:centos6.8
Tagging centos:6.8

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


$ bashbrew build centos:centos6.7
Using bashbrew/cache:788235800c44491534389f1742c1f7352745d43a49c6876639a229597a4d9c61 (centos:centos6.7)
Tagging centos:centos6.7
Tagging centos:6.7

$ test/run.sh centos:centos6.7
testing centos:centos6.7
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...error: crypt password detected for 'root': '$6$QhN6G8YM$LDd5zhqarhgMy6/e1c6wYwbusi4RZBz3lfRNQ1p5VquqtHzIj.Tf9r7cqoaSLgI3FiCPzfePyTBG7omBKv9bF0'
failed
	'override-cmd' [4/4]...passed


$ bashbrew build centos:centos6.6
Using bashbrew/cache:efa70939a6e829a4a9f3b0267d381abcf417a1292ee3d3c641b239f731c76d2e (centos:centos6.6)
Tagging centos:centos6.6
Tagging centos:6.6

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

The following images failed at least one test:

  • centos:
    • centos:centos7.1.1503
    • centos:centos7.0.1406
    • centos:centos6.7

@yosifkit yosifkit merged commit 099d308 into docker-library:master Jun 5, 2017
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