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 6 and 7 monthly images as of 20170315 #2750

Merged
merged 1 commit into from
Mar 15, 2017
Merged

update centos 6 and 7 monthly images as of 20170315 #2750

merged 1 commit into from
Mar 15, 2017

Conversation

jperrin
Copy link
Contributor

@jperrin jperrin commented Mar 15, 2017

No description provided.

@yosifkit
Copy link
Member

yosifkit commented Mar 15, 2017

Edit: updated to shorter diff using #2558

diff --git a/centos_6/Dockerfile b/centos_6/Dockerfile
index b8121ed..750674d 100644
--- a/centos_6/Dockerfile
+++ b/centos_6/Dockerfile
@@ -5,6 +5,6 @@ ADD centos-6-docker.tar.xz /
 LABEL name="CentOS Base Image" \
     vendor="CentOS" \
     license="GPLv2" \
-    build-date="20161102"
+    build-date="20170315"
 
 CMD ["/bin/bash"]
diff --git a/centos_6/centos-6-docker.tar.xz b/centos_6/centos-6-docker.tar.xz
index e90c527..9d89ea2 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 869ac08..6507b28 100644
--- a/centos_6/centos-6-docker.tar.xz  'tar -t'	
+++ b/centos_6/centos-6-docker.tar.xz  'tar -t'	
@@ -8001,6 +8001,7 @@
 ./usr/share/zoneinfo/America/Port_of_Spain
 ./usr/share/zoneinfo/America/Porto_Velho
 ./usr/share/zoneinfo/America/Puerto_Rico
+./usr/share/zoneinfo/America/Punta_Arenas
 ./usr/share/zoneinfo/America/Rainy_River
 ./usr/share/zoneinfo/America/Rankin_Inlet
 ./usr/share/zoneinfo/America/Recife
@@ -8059,6 +8060,7 @@
 ./usr/share/zoneinfo/Asia/Aqtobe
 ./usr/share/zoneinfo/Asia/Ashgabat
 ./usr/share/zoneinfo/Asia/Ashkhabad
+./usr/share/zoneinfo/Asia/Atyrau
 ./usr/share/zoneinfo/Asia/Baghdad
 ./usr/share/zoneinfo/Asia/Bahrain
 ./usr/share/zoneinfo/Asia/Baku
@@ -8079,6 +8081,7 @@
 ./usr/share/zoneinfo/Asia/Dili
 ./usr/share/zoneinfo/Asia/Dubai
 ./usr/share/zoneinfo/Asia/Dushanbe
+./usr/share/zoneinfo/Asia/Famagusta
 ./usr/share/zoneinfo/Asia/Gaza
 ./usr/share/zoneinfo/Asia/Harbin
 ./usr/share/zoneinfo/Asia/Hebron
@@ -8291,6 +8294,7 @@
 ./usr/share/zoneinfo/Europe/Samara
 ./usr/share/zoneinfo/Europe/San_Marino
 ./usr/share/zoneinfo/Europe/Sarajevo
+./usr/share/zoneinfo/Europe/Saratov
 ./usr/share/zoneinfo/Europe/Simferopol
 ./usr/share/zoneinfo/Europe/Skopje
 ./usr/share/zoneinfo/Europe/Sofia
@@ -8586,6 +8590,7 @@
 ./usr/share/zoneinfo/posix/America/Port_of_Spain
 ./usr/share/zoneinfo/posix/America/Porto_Velho
 ./usr/share/zoneinfo/posix/America/Puerto_Rico
+./usr/share/zoneinfo/posix/America/Punta_Arenas
 ./usr/share/zoneinfo/posix/America/Rainy_River
 ./usr/share/zoneinfo/posix/America/Rankin_Inlet
 ./usr/share/zoneinfo/posix/America/Recife
@@ -8644,6 +8649,7 @@
 ./usr/share/zoneinfo/posix/Asia/Aqtobe
 ./usr/share/zoneinfo/posix/Asia/Ashgabat
 ./usr/share/zoneinfo/posix/Asia/Ashkhabad
+./usr/share/zoneinfo/posix/Asia/Atyrau
 ./usr/share/zoneinfo/posix/Asia/Baghdad
 ./usr/share/zoneinfo/posix/Asia/Bahrain
 ./usr/share/zoneinfo/posix/Asia/Baku
@@ -8664,6 +8670,7 @@
 ./usr/share/zoneinfo/posix/Asia/Dili
 ./usr/share/zoneinfo/posix/Asia/Dubai
 ./usr/share/zoneinfo/posix/Asia/Dushanbe
+./usr/share/zoneinfo/posix/Asia/Famagusta
 ./usr/share/zoneinfo/posix/Asia/Gaza
 ./usr/share/zoneinfo/posix/Asia/Harbin
 ./usr/share/zoneinfo/posix/Asia/Hebron
@@ -8876,6 +8883,7 @@
 ./usr/share/zoneinfo/posix/Europe/Samara
 ./usr/share/zoneinfo/posix/Europe/San_Marino
 ./usr/share/zoneinfo/posix/Europe/Sarajevo
+./usr/share/zoneinfo/posix/Europe/Saratov
 ./usr/share/zoneinfo/posix/Europe/Simferopol
 ./usr/share/zoneinfo/posix/Europe/Skopje
 ./usr/share/zoneinfo/posix/Europe/Sofia
@@ -9199,6 +9207,7 @@
 ./usr/share/zoneinfo/right/America/Port_of_Spain
 ./usr/share/zoneinfo/right/America/Porto_Velho
 ./usr/share/zoneinfo/right/America/Puerto_Rico
+./usr/share/zoneinfo/right/America/Punta_Arenas
 ./usr/share/zoneinfo/right/America/Rainy_River
 ./usr/share/zoneinfo/right/America/Rankin_Inlet
 ./usr/share/zoneinfo/right/America/Recife
@@ -9257,6 +9266,7 @@
 ./usr/share/zoneinfo/right/Asia/Aqtobe
 ./usr/share/zoneinfo/right/Asia/Ashgabat
 ./usr/share/zoneinfo/right/Asia/Ashkhabad
+./usr/share/zoneinfo/right/Asia/Atyrau
 ./usr/share/zoneinfo/right/Asia/Baghdad
 ./usr/share/zoneinfo/right/Asia/Bahrain
 ./usr/share/zoneinfo/right/Asia/Baku
@@ -9277,6 +9287,7 @@
 ./usr/share/zoneinfo/right/Asia/Dili
 ./usr/share/zoneinfo/right/Asia/Dubai
 ./usr/share/zoneinfo/right/Asia/Dushanbe
+./usr/share/zoneinfo/right/Asia/Famagusta
 ./usr/share/zoneinfo/right/Asia/Gaza
 ./usr/share/zoneinfo/right/Asia/Harbin
 ./usr/share/zoneinfo/right/Asia/Hebron
@@ -9489,6 +9500,7 @@
 ./usr/share/zoneinfo/right/Europe/Samara
 ./usr/share/zoneinfo/right/Europe/San_Marino
 ./usr/share/zoneinfo/right/Europe/Sarajevo
+./usr/share/zoneinfo/right/Europe/Saratov
 ./usr/share/zoneinfo/right/Europe/Simferopol
 ./usr/share/zoneinfo/right/Europe/Skopje
 ./usr/share/zoneinfo/right/Europe/Sofia
@@ -9640,6 +9652,7 @@
 ./usr/share/zoneinfo/UTC
 ./usr/share/zoneinfo/WET
 ./usr/share/zoneinfo/W-SU
+./usr/share/zoneinfo/zone1970.tab
 ./usr/share/zoneinfo/zone.tab
 ./usr/share/zoneinfo/Zulu
 ./usr/src/
diff --git a/centos_7/Dockerfile b/centos_7/Dockerfile
index c841412..38d92bc 100644
--- a/centos_7/Dockerfile
+++ b/centos_7/Dockerfile
@@ -5,6 +5,6 @@ ADD centos-7-docker.tar.xz /
 LABEL name="CentOS Base Image" \
     vendor="CentOS" \
     license="GPLv2" \
-    build-date="20161214"
+    build-date="20170315"
 
 CMD ["/bin/bash"]
diff --git a/centos_7/centos-7-docker.tar.xz b/centos_7/centos-7-docker.tar.xz
index e99c8e7..f9f816d 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 9cb1450..6d39e5c 100644
--- a/centos_7/centos-7-docker.tar.xz  'tar -t'	
+++ b/centos_7/centos-7-docker.tar.xz  'tar -t'	
@@ -273,7 +273,6 @@
 ./etc/X11/applnk/
 ./etc/X11/fontpath.d/
 ./etc/X11/xorg.conf.d/
-./etc/X11/xorg.conf.d/00-keyboard.conf
 ./etc/xdg/
 ./etc/xdg/autostart/
 ./etc/xdg/systemd/
@@ -313,6 +312,7 @@
 ./root/.bash_profile
 ./root/.bashrc
 ./root/.cshrc
+./root/original-ks.cfg
 ./root/.tcshrc
 ./run/
 ./run/console/
@@ -341,7 +341,7 @@
 ./tmp/
 ./tmp/.font-unix/
 ./tmp/.ICE-unix/
-./tmp/ks-script-LRoSA2
+./tmp/ks-script-AkSWCX
 ./tmp/.Test-unix/
 ./tmp/.X11-unix/
 ./tmp/.XIM-unix/
@@ -7160,6 +7160,7 @@
 ./usr/share/zoneinfo/America/Port_of_Spain
 ./usr/share/zoneinfo/America/Porto_Velho
 ./usr/share/zoneinfo/America/Puerto_Rico
+./usr/share/zoneinfo/America/Punta_Arenas
 ./usr/share/zoneinfo/America/Rainy_River
 ./usr/share/zoneinfo/America/Rankin_Inlet
 ./usr/share/zoneinfo/America/Recife
@@ -7748,6 +7749,7 @@
 ./usr/share/zoneinfo/posix/America/Port_of_Spain
 ./usr/share/zoneinfo/posix/America/Porto_Velho
 ./usr/share/zoneinfo/posix/America/Puerto_Rico
+./usr/share/zoneinfo/posix/America/Punta_Arenas
 ./usr/share/zoneinfo/posix/America/Rainy_River
 ./usr/share/zoneinfo/posix/America/Rankin_Inlet
 ./usr/share/zoneinfo/posix/America/Recife
@@ -8364,6 +8366,7 @@
 ./usr/share/zoneinfo/right/America/Port_of_Spain
 ./usr/share/zoneinfo/right/America/Porto_Velho
 ./usr/share/zoneinfo/right/America/Puerto_Rico
+./usr/share/zoneinfo/right/America/Punta_Arenas
 ./usr/share/zoneinfo/right/America/Rainy_River
 ./usr/share/zoneinfo/right/America/Rankin_Inlet
 ./usr/share/zoneinfo/right/America/Recife
@@ -8808,6 +8811,7 @@
 ./usr/share/zoneinfo/UTC
 ./usr/share/zoneinfo/WET
 ./usr/share/zoneinfo/W-SU
+./usr/share/zoneinfo/zone1970.tab
 ./usr/share/zoneinfo/zone.tab
 ./usr/share/zoneinfo/Zulu
 ./usr/share/zsh/
@@ -8903,6 +8907,7 @@
 ./var/log/
 ./var/log/btmp
 ./var/log/lastlog
+./var/log/rhsm/
 ./var/log/tallylog
 ./var/log/wtmp
 ./var/log/yum.log

@yosifkit
Copy link
Member

Build test of #2750; d0a395c (centos):

$ bashbrew build centos:latest
Building bashbrew/cache:eec8e90e892d803413e7e0d68d698d367635b0814fc7076d0e88c12bac99b0d9 (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:4b859b26fb07219788ec7d8fdfd61f0ae3af033fff91e42f5d058053aac9188d (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:centos5
Using bashbrew/cache:f65ad6a5052b386734f84ccccf2c25a733431eeae988140baad1e5399bdce812 (centos:centos5)
Tagging centos:centos5
Tagging centos:5

$ test/run.sh centos:centos5
testing centos:centos5
	'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.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.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


$ bashbrew build centos:centos5.11
Using bashbrew/cache:c0e7b43e54525b0a996eb831741ba2e80a77aea02baaae62b2d8c1f4432c796b (centos:centos5.11)
Tagging centos:centos5.11
Tagging centos:5.11

$ test/run.sh centos:centos5.11
testing centos:centos5.11
	'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
bash: line 129: syntax error near `x129'
bash: line 129: `for x129 in ; do :'
failed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

The following images failed at least one test:

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

@yosifkit yosifkit merged commit 8b5cc03 into docker-library:master Mar 15, 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