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

alpine: edge snapshot 20190809 #6437

Merged
merged 1 commit into from
Aug 9, 2019

Conversation

ncopa
Copy link
Contributor

@ncopa ncopa commented Aug 9, 2019

contains busybox-1.31 and musl-1.1.23 + backport patch for
CVE-2019-14697.

contains busybox-1.31 and musl-1.1.23 + backport patch for
CVE-2019-14697.
@tianon
Copy link
Member

tianon commented Aug 9, 2019

Diff:
diff --git a/_bashbrew-list b/_bashbrew-list
index 0364fb7..a86065d 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,6 +6,6 @@ alpine:3.9
 alpine:3.9.4
 alpine:3.10
 alpine:3.10.1
-alpine:20190707
+alpine:20190809
 alpine:edge
 alpine:latest
diff --git a/alpine_edge/Dockerfile b/alpine_edge/Dockerfile
index 3bcc147..a88c43f 100644
--- a/alpine_edge/Dockerfile
+++ b/alpine_edge/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD alpine-minirootfs-20190707-x86_64.tar.gz /
+ADD alpine-minirootfs-20190809-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_edge/alpine-minirootfs-20190707-x86_64.tar.gz b/alpine_edge/alpine-minirootfs-20190809-x86_64.tar.gz
similarity index 30%
rename from alpine_edge/alpine-minirootfs-20190707-x86_64.tar.gz
rename to alpine_edge/alpine-minirootfs-20190809-x86_64.tar.gz
index 341f3c2..f7fe859 100644
Binary files a/alpine_edge/alpine-minirootfs-20190707-x86_64.tar.gz and b/alpine_edge/alpine-minirootfs-20190809-x86_64.tar.gz differ
diff --git a/alpine_edge/alpine-minirootfs-20190707-x86_64.tar.gz  'tar -t' b/alpine_edge/alpine-minirootfs-20190809-x86_64.tar.gz  'tar -t'
similarity index 99%
rename from alpine_edge/alpine-minirootfs-20190707-x86_64.tar.gz  'tar -t'
rename to alpine_edge/alpine-minirootfs-20190809-x86_64.tar.gz  'tar -t'
index d74d790..262add3 100644
--- a/alpine_edge/alpine-minirootfs-20190707-x86_64.tar.gz  'tar -t'	
+++ b/alpine_edge/alpine-minirootfs-20190809-x86_64.tar.gz  'tar -t'	
@@ -475,9 +475,11 @@ var/local/
 var/lock/
 var/lock/subsys/
 var/log/
+var/mail/
 var/opt/
 var/run
 var/spool/
 var/spool/cron/
 var/spool/cron/crontabs
+var/spool/mail
 var/tmp/

@tianon
Copy link
Member

tianon commented Aug 9, 2019

LGTM

Build test of #6437; 234af74; amd64 (alpine):

$ bashbrew build alpine:20190809
Building bashbrew/cache:620dd65d2fdbd16eb917a1e4e8201c9dc7cd2167713d5ef98927bd2a86abcad9 (alpine:20190809)
Tagging alpine:20190809
Tagging alpine:edge

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


$ bashbrew build alpine:3.10.1
Using bashbrew/cache:e16b9066a249216a7e049a91d99dcbf897448ac51e8885bb5f4cd65b980c90d2 (alpine:3.10.1)
Tagging alpine:3.10.1
Tagging alpine:3.10
Tagging alpine:latest

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


$ bashbrew build alpine:3.9.4
Using bashbrew/cache:5e814902d304ccc520bbff978498ac48e2f39b09b8050e8fce8cefabd004b3b5 (alpine:3.9.4)
Tagging alpine:3.9.4
Tagging alpine:3.9

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


$ bashbrew build alpine:3.8.4
Using bashbrew/cache:6e66a2307413f7c1556c729d6288fa1b64a93567bc5394acdfef206994dc930b (alpine:3.8.4)
Tagging alpine:3.8.4
Tagging alpine:3.8

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


$ bashbrew build alpine:3.7.3
Using bashbrew/cache:a1af553b9fdbd71c4caa5339ef8e4d8fcce8c90b3975f964dd40b92c177c8c70 (alpine:3.7.3)
Tagging alpine:3.7.3
Tagging alpine:3.7

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

@tianon tianon merged commit fe36432 into docker-library:master Aug 9, 2019
@ncopa ncopa deleted the snapshot-20190809 branch August 20, 2019 11:50
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