alpine: builds from new upstream by ncopa · Pull Request #5516 · docker-library/official-images

ncopa · 2019-03-06T22:21:46Z

Builds are now only generated from upstream minirootfs taballs. The
release and update scripts have been refactored and moved to
https://github.com/alpinelinux/docker-alpine

This commit also include update of all supported images:

edge (20190228 snapshot)
v3.9.2
v3.8.4
v3.7.3
v3.6.5

This commit also introduces v3.9 armv7 image and remove unsupported
branches v3.5 and older.

fixes at least the following issues:

ncopa · 2019-03-06T22:23:33Z

The scripts for generating the build has been completely refactored. Please be extra careful before merging this. I would appreciate a review of the scripts too.

tianon · 2019-03-06T23:38:51Z

Looking over the diff, the main filesystem changes appear to be the removal of /etc/localtime, but the utc test still passes so that's totally harmless. I think the only concern I see is the change in the tag naming convention (the added v prefix on the version numbers).

Additionally, since these tarballs are now coming from explicit Alpine releases, I think it would also make sense to consider minor version tags too, right? (like alpine:3.9.2, for example)

yosifkit · 2019-03-06T23:41:00Z

library/alpine

-amd64-GitFetch: refs/heads/rootfs/library-3.4
-amd64-GitCommit: 3943f4dedc41b7c6144610d3e99ad0f7083c2138
-amd64-Directory: versions/library-3.4
+Architecture: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64


These need to be Architectures. 😉

good catch. will fix

ncopa · 2019-03-07T06:44:35Z

Looking over the diff, the main filesystem changes appear to be the removal of /etc/localtime, but the utc test still passes so that's totally harmless.

This was intentional. The UTC issue is fixed in musl.

I think the only concern I see is the change in the tag naming convention (the added v prefix on the version numbers).

This was not intentional. I will fix this.

Additionally, since these tarballs are now coming from explicit Alpine releases, I think it would also make sense to consider minor version tags too, right? (like alpine:3.9.2, for example)

Do you mean that I should add all the older releases or only add another tag:

diff --git a/library/alpine b/library/alpine
index a2e49734..cccba95d 100644
--- a/library/alpine
+++ b/library/alpine
@@ -13,7 +13,7 @@ s390x-Directory: s390x/
 i386-Directory: x86/
 amd64-Directory: x86_64/
 
-Tags: v3.9, latest
+Tags: 3.9.2, 3.9, latest
 Architecture: arm64v8, arm32v6, arm32v7, ppc64le, s390x, i386, amd64
 GitFetch: refs/heads/v3.9
 GitCommit: 847dd9a734df631555265ccf598ce635d3fe1453
@@ -25,7 +25,7 @@ s390x-Directory: s390x/
 i386-Directory: x86/
 amd64-Directory: x86_64/
 
-Tags: v3.8
+Tags: 3.8.4, 3.8
 Architecture: arm64v8, arm32v6, ppc64le, s390x, i386, amd64
 GitFetch: refs/heads/v3.8
 GitCommit: dc10be162e9d2c3f799fde73e25ad30f78ff479b

tianon · 2019-03-07T06:46:24Z

Do you mean that I should add all the older releases or only add another tag:

I was meaning the latter (exactly the diff you included there) -- it's something to consider, since they'd be semantically meaningful now (and there are quite a few folks asking for such a thing over on the gliderlabs repo).

Also the Architecture: to Architectures: change @yosifkit noted. 👍

Builds are now only generated from upstream minirootfs taballs. The release and update scripts have been refactored and moved to https://github.com/alpinelinux/docker-alpine This commit also include update of all supported images: - edge (20190228 snapshot) - v3.9.2 - v3.8.4 - v3.7.3 - v3.6.5 This commit also introduces v3.9 armv7 image and remove unsupported branches v3.5 and older. fixes at least the following issues: - gliderlabs/docker-alpine#495 - gliderlabs/docker-alpine#471 - gliderlabs/docker-alpine#463 - gliderlabs/docker-alpine#460 - gliderlabs/docker-alpine#455 - gliderlabs/docker-alpine#430 (security) - gliderlabs/docker-alpine#375

ncopa · 2019-03-07T21:18:58Z

should be fixed now

yosifkit · 2019-03-07T21:48:16Z

Diff:

diff --git a/_bashbrew-arches b/_bashbrew-arches
index 8a9550b..a30bf93 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,8 +1,3 @@
-alpine:3.1 @ amd64
-alpine:3.2 @ amd64
-alpine:3.3 @ amd64
-alpine:3.4 @ amd64
-alpine:3.5 @ amd64
 alpine:3.6 @ amd64
 alpine:3.6 @ arm32v6
 alpine:3.6 @ arm64v8
@@ -23,12 +18,14 @@ alpine:3.8 @ ppc64le
 alpine:3.8 @ s390x
 alpine:edge @ amd64
 alpine:edge @ arm32v6
+alpine:edge @ arm32v7
 alpine:edge @ arm64v8
 alpine:edge @ i386
 alpine:edge @ ppc64le
 alpine:edge @ s390x
 alpine:latest @ amd64
 alpine:latest @ arm32v6
+alpine:latest @ arm32v7
 alpine:latest @ arm64v8
 alpine:latest @ i386
 alpine:latest @ ppc64le
diff --git a/_bashbrew-list b/_bashbrew-list
index 6305ea0..a69bef8 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,11 +1,11 @@
-alpine:3.1
-alpine:3.2
-alpine:3.3
-alpine:3.4
-alpine:3.5
 alpine:3.6
+alpine:3.6.5
 alpine:3.7
+alpine:3.7.3
 alpine:3.8
+alpine:3.8.4
 alpine:3.9
+alpine:3.9.2
+alpine:20190228
 alpine:edge
 alpine:latest
diff --git a/alpine_3.1/Dockerfile b/alpine_3.1/Dockerfile
deleted file mode 100644
index 94cb030..0000000
diff --git a/alpine_3.1/rootfs.tar.xz b/alpine_3.1/rootfs.tar.xz
deleted file mode 100644
index 3c5218d..0000000
diff --git a/alpine_3.1/rootfs.tar.xz  'tar -t' b/alpine_3.1/rootfs.tar.xz  'tar -t'
deleted file mode 100644
index 6ef6399..0000000
diff --git a/alpine_3.2/Dockerfile b/alpine_3.2/Dockerfile
deleted file mode 100644
index 94cb030..0000000
diff --git a/alpine_3.2/rootfs.tar.xz  'tar -t' b/alpine_3.2/rootfs.tar.xz  'tar -t'
deleted file mode 100644
index 3b9598d..0000000
diff --git a/alpine_3.3/Dockerfile b/alpine_3.3/Dockerfile
deleted file mode 100644
index 94cb030..0000000
diff --git a/alpine_3.3/rootfs.tar.xz  'tar -t' b/alpine_3.3/rootfs.tar.xz  'tar -t'
deleted file mode 100644
index 77de5d7..0000000
diff --git a/alpine_3.4/Dockerfile b/alpine_3.4/Dockerfile
deleted file mode 100644
index 94cb030..0000000
diff --git a/alpine_3.4/rootfs.tar.xz  'tar -t' b/alpine_3.4/rootfs.tar.xz  'tar -t'
deleted file mode 100644
index 1339b2a..0000000
diff --git a/alpine_3.5/Dockerfile b/alpine_3.5/Dockerfile
deleted file mode 100644
index 94cb030..0000000
diff --git a/alpine_3.5/rootfs.tar.xz b/alpine_3.5/rootfs.tar.xz
deleted file mode 100644
index 0d6a61f..0000000
diff --git a/alpine_3.5/rootfs.tar.xz  'tar -t' b/alpine_3.5/rootfs.tar.xz  'tar -t'
deleted file mode 100644
index 0b99d48..0000000
diff --git a/alpine_3.6/Dockerfile b/alpine_3.6/Dockerfile
index 94cb030..502af7d 100644
--- a/alpine_3.6/Dockerfile
+++ b/alpine_3.6/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD rootfs.tar.xz /
+ADD alpine-minirootfs-3.6.5-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_3.4/rootfs.tar.xz b/alpine_3.6/alpine-minirootfs-3.6.5-x86_64.tar.gz
similarity index 21%
rename from alpine_3.4/rootfs.tar.xz
rename to alpine_3.6/alpine-minirootfs-3.6.5-x86_64.tar.gz
index 8dcb6e0..02c8895 100644
Binary files a/alpine_3.4/rootfs.tar.xz and b/alpine_3.6/alpine-minirootfs-3.6.5-x86_64.tar.gz differ
diff --git a/alpine_3.6/rootfs.tar.xz  'tar -t' b/alpine_3.6/alpine-minirootfs-3.6.5-x86_64.tar.gz  'tar -t'
similarity index 99%
rename from alpine_3.6/rootfs.tar.xz  'tar -t'
rename to alpine_3.6/alpine-minirootfs-3.6.5-x86_64.tar.gz  'tar -t'
index 7e56a9e..ffc88bb 100644
--- a/alpine_3.6/rootfs.tar.xz  'tar -t'	
+++ b/alpine_3.6/alpine-minirootfs-3.6.5-x86_64.tar.gz  'tar -t'	
@@ -102,7 +102,6 @@ etc/hosts
 etc/init.d/
 etc/inittab
 etc/issue
-etc/localtime
 etc/logrotate.d/
 etc/logrotate.d/acpid
 etc/modprobe.d/
diff --git a/alpine_3.6/rootfs.tar.xz b/alpine_3.6/rootfs.tar.xz
deleted file mode 100644
index b61ddad..0000000
diff --git a/alpine_3.7/Dockerfile b/alpine_3.7/Dockerfile
index 94cb030..83fa414 100644
--- a/alpine_3.7/Dockerfile
+++ b/alpine_3.7/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD rootfs.tar.xz /
+ADD alpine-minirootfs-3.7.3-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_3.2/rootfs.tar.xz b/alpine_3.7/alpine-minirootfs-3.7.3-x86_64.tar.gz
similarity index 23%
rename from alpine_3.2/rootfs.tar.xz
rename to alpine_3.7/alpine-minirootfs-3.7.3-x86_64.tar.gz
index ccda6cc..90369a1 100644
Binary files a/alpine_3.2/rootfs.tar.xz and b/alpine_3.7/alpine-minirootfs-3.7.3-x86_64.tar.gz differ
diff --git a/alpine_3.7/rootfs.tar.xz  'tar -t' b/alpine_3.7/alpine-minirootfs-3.7.3-x86_64.tar.gz  'tar -t'
similarity index 99%
rename from alpine_3.7/rootfs.tar.xz  'tar -t'
rename to alpine_3.7/alpine-minirootfs-3.7.3-x86_64.tar.gz  'tar -t'
index 23712ee..749b3c9 100644
--- a/alpine_3.7/rootfs.tar.xz  'tar -t'	
+++ b/alpine_3.7/alpine-minirootfs-3.7.3-x86_64.tar.gz  'tar -t'	
@@ -103,7 +103,6 @@ etc/hosts
 etc/init.d/
 etc/inittab
 etc/issue
-etc/localtime
 etc/logrotate.d/
 etc/logrotate.d/acpid
 etc/modprobe.d/
diff --git a/alpine_3.7/rootfs.tar.xz b/alpine_3.7/rootfs.tar.xz
deleted file mode 100644
index bc515a2..0000000
diff --git a/alpine_3.8/Dockerfile b/alpine_3.8/Dockerfile
index 94cb030..fe51994 100644
--- a/alpine_3.8/Dockerfile
+++ b/alpine_3.8/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD rootfs.tar.xz /
+ADD alpine-minirootfs-3.8.4-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_3.3/rootfs.tar.xz b/alpine_3.8/alpine-minirootfs-3.8.4-x86_64.tar.gz
similarity index 21%
rename from alpine_3.3/rootfs.tar.xz
rename to alpine_3.8/alpine-minirootfs-3.8.4-x86_64.tar.gz
index c4f2298..51c4c3a 100644
Binary files a/alpine_3.3/rootfs.tar.xz and b/alpine_3.8/alpine-minirootfs-3.8.4-x86_64.tar.gz differ
diff --git a/alpine_3.8/rootfs.tar.xz  'tar -t' b/alpine_3.8/alpine-minirootfs-3.8.4-x86_64.tar.gz  'tar -t'
similarity index 99%
rename from alpine_3.8/rootfs.tar.xz  'tar -t'
rename to alpine_3.8/alpine-minirootfs-3.8.4-x86_64.tar.gz  'tar -t'
index 3d853fd..b1afa50 100644
--- a/alpine_3.8/rootfs.tar.xz  'tar -t'	
+++ b/alpine_3.8/alpine-minirootfs-3.8.4-x86_64.tar.gz  'tar -t'	
@@ -104,7 +104,6 @@ etc/hosts
 etc/init.d/
 etc/inittab
 etc/issue
-etc/localtime
 etc/logrotate.d/
 etc/logrotate.d/acpid
 etc/modprobe.d/
diff --git a/alpine_3.8/rootfs.tar.xz b/alpine_3.8/rootfs.tar.xz
deleted file mode 100644
index ed4cc00..0000000
diff --git a/alpine_edge/Dockerfile b/alpine_edge/Dockerfile
index 94cb030..575481a 100644
--- a/alpine_edge/Dockerfile
+++ b/alpine_edge/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD rootfs.tar.xz /
+ADD alpine-minirootfs-20190228-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_latest/rootfs.tar.xz b/alpine_edge/alpine-minirootfs-20190228-x86_64.tar.gz
similarity index 26%
rename from alpine_latest/rootfs.tar.xz
rename to alpine_edge/alpine-minirootfs-20190228-x86_64.tar.gz
index 93dc6e4..7fddbe9 100644
Binary files a/alpine_latest/rootfs.tar.xz and b/alpine_edge/alpine-minirootfs-20190228-x86_64.tar.gz differ
diff --git a/alpine_edge/rootfs.tar.xz  'tar -t' b/alpine_edge/alpine-minirootfs-20190228-x86_64.tar.gz  'tar -t'
similarity index 99%
rename from alpine_edge/rootfs.tar.xz  'tar -t'
rename to alpine_edge/alpine-minirootfs-20190228-x86_64.tar.gz  'tar -t'
index 184fc4c..6ed3609 100644
--- a/alpine_edge/rootfs.tar.xz  'tar -t'	
+++ b/alpine_edge/alpine-minirootfs-20190228-x86_64.tar.gz  'tar -t'	
@@ -104,7 +104,6 @@ etc/hosts
 etc/init.d/
 etc/inittab
 etc/issue
-etc/localtime
 etc/logrotate.d/
 etc/logrotate.d/acpid
 etc/modprobe.d/
@@ -254,6 +253,7 @@ usr/bin/[
 usr/bin/[[
 usr/bin/awk
 usr/bin/basename
+usr/bin/bc
 usr/bin/beep
 usr/bin/blkdiscard
 usr/bin/bunzip2
diff --git a/alpine_latest/Dockerfile b/alpine_latest/Dockerfile
index 94cb030..9d7ecd1 100644
--- a/alpine_latest/Dockerfile
+++ b/alpine_latest/Dockerfile
@@ -1,3 +1,3 @@
 FROM scratch
-ADD rootfs.tar.xz /
+ADD alpine-minirootfs-3.9.2-x86_64.tar.gz /
 CMD ["/bin/sh"]
diff --git a/alpine_edge/rootfs.tar.xz b/alpine_latest/alpine-minirootfs-3.9.2-x86_64.tar.gz
similarity index 26%
rename from alpine_edge/rootfs.tar.xz
rename to alpine_latest/alpine-minirootfs-3.9.2-x86_64.tar.gz
index a394961..8c93d6b 100644
Binary files a/alpine_edge/rootfs.tar.xz and b/alpine_latest/alpine-minirootfs-3.9.2-x86_64.tar.gz differ
diff --git a/alpine_latest/rootfs.tar.xz  'tar -t' b/alpine_latest/alpine-minirootfs-3.9.2-x86_64.tar.gz  'tar -t'
similarity index 99%
rename from alpine_latest/rootfs.tar.xz  'tar -t'
rename to alpine_latest/alpine-minirootfs-3.9.2-x86_64.tar.gz  'tar -t'
index 184fc4c..a65fac6 100644
--- a/alpine_latest/rootfs.tar.xz  'tar -t'	
+++ b/alpine_latest/alpine-minirootfs-3.9.2-x86_64.tar.gz  'tar -t'	
@@ -104,7 +104,6 @@ etc/hosts
 etc/init.d/
 etc/inittab
 etc/issue
-etc/localtime
 etc/logrotate.d/
 etc/logrotate.d/acpid
 etc/modprobe.d/

yosifkit · 2019-03-07T21:50:30Z

Build test of #5516; 889772f; amd64 (alpine):

$ bashbrew build alpine:20190228
Using bashbrew/cache:04092d104ae0b84184793c3272900170ee9cc93e2403e091a9460436ce3492a9 (alpine:20190228)
Tagging alpine:20190228
Tagging alpine:edge

$ test/run.sh alpine:20190228
testing alpine:20190228
	'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.2
Using bashbrew/cache:112037b5851c75ae44404ba17565ca8e6a61878eeb2517b6e587845d1bc71cbd (alpine:3.9.2)
Tagging alpine:3.9.2
Tagging alpine:3.9
Tagging alpine:latest

$ test/run.sh alpine:3.9.2
testing alpine:3.9.2
	'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:ce250b371f409b12f9fb336600d44cce010cf691c7100a95b1b5560256bc0412 (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:a8205b9687855982c5923ee8a4c80c1b8b5684e60817751ccb97d0819f66468a (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


$ bashbrew build alpine:3.6.5
Using bashbrew/cache:38313153ac3a8a88102881779277ed973743c2f82b7d5a0d05d51c62f4b8e074 (alpine:3.6.5)
Tagging alpine:3.6.5
Tagging alpine:3.6

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

ncopa force-pushed the alpine-updates branch from 75f28e4 to 88a0c08 Compare March 6, 2019 22:25

docker-library-bot added the library/alpine label Mar 6, 2019

ncopa force-pushed the alpine-updates branch from 88a0c08 to 05e6b36 Compare March 6, 2019 22:38

This comment has been minimized.

Sign in to view

yosifkit reviewed Mar 6, 2019

View reviewed changes

ncopa force-pushed the alpine-updates branch from 05e6b36 to 889772f Compare March 7, 2019 07:17

yosifkit merged commit 4880370 into docker-library:master Mar 7, 2019

ncopa mentioned this pull request Mar 8, 2019

Default installation allows user to su to root without password after installing shadow-package gliderlabs/docker-alpine#430

Closed

yosifkit mentioned this pull request Mar 13, 2019

Upgraded CrateDB to 3.2.5 #5537

Merged

ncopa deleted the alpine-updates branch April 8, 2019 13:56

richlander mentioned this pull request Apr 15, 2019

Add support for Alpine ARM32 dotnet/dotnet-docker#1059

Closed

4 tasks

yosifkit mentioned this pull request May 8, 2019

CVE-2019-5021: Fix "DISABLE_ROOT_PASSWD" default value for build "options" files gliderlabs/docker-alpine#511

Open

ncopa mentioned this pull request May 9, 2019

CVE-2019-5021 alpinelinux/docker-alpine#13

Closed

wglambert mentioned this pull request May 13, 2019

CVE-2019-5021 vulnerability docker-library/openjdk#317

Closed

grzesuav mentioned this pull request Jul 4, 2019

Provide an Alpine Image with an root password AdoptOpenJDK/openjdk-docker#152

Closed

wglambert mentioned this pull request May 13, 2019

CVE-2019-5021 vulnerability docker-library/openjdk#317

Closed

grzesuav mentioned this pull request Jul 4, 2019

Provide an Alpine Image with an root password AdoptOpenJDK/openjdk-docker#152

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

alpine: builds from new upstream#5516

alpine: builds from new upstream#5516
yosifkit merged 1 commit intodocker-library:masterfrom
ncopa:alpine-updates

ncopa commented Mar 6, 2019 •

edited

Loading

Uh oh!

ncopa commented Mar 6, 2019

Uh oh!

This comment has been minimized.

tianon commented Mar 6, 2019

Uh oh!

yosifkit Mar 6, 2019

Uh oh!

ncopa Mar 7, 2019

Uh oh!

ncopa commented Mar 7, 2019

Uh oh!

tianon commented Mar 7, 2019

Uh oh!

ncopa commented Mar 7, 2019

Uh oh!

yosifkit commented Mar 7, 2019

Uh oh!

yosifkit commented Mar 7, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

ncopa commented Mar 6, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ncopa commented Mar 6, 2019

Uh oh!

This comment has been minimized.

tianon commented Mar 6, 2019

Uh oh!

yosifkit Mar 6, 2019

Choose a reason for hiding this comment

Uh oh!

ncopa Mar 7, 2019

Choose a reason for hiding this comment

Uh oh!

ncopa commented Mar 7, 2019

Uh oh!

tianon commented Mar 7, 2019

Uh oh!

ncopa commented Mar 7, 2019

Uh oh!

yosifkit commented Mar 7, 2019

Uh oh!

yosifkit commented Mar 7, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ncopa commented Mar 6, 2019 •

edited

Loading