From 98a99c6482455f2b51a4b30bb36e59bfe7e970b7 Mon Sep 17 00:00:00 2001
From: Rolf Neugebauer <rolf.neugebauer@docker.com>
Date: Mon, 8 May 2017 19:22:15 +0100
Subject: [PATCH] tools: Add packages to alpine base to create a base system

The added packages are necessary to create a base Alpine
container image and for converting more packages.

Update the versions file to the latest versions

Also make the HUB org/registry build time configurable.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
---
 tools/alpine/Makefile | 13 +++++++------
 tools/alpine/packages |  6 ++++++
 tools/alpine/versions | 41 ++++++++++++++++++++++-------------------
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/tools/alpine/Makefile b/tools/alpine/Makefile
index 18ded11b1..06671198c 100644
--- a/tools/alpine/Makefile
+++ b/tools/alpine/Makefile
@@ -1,7 +1,8 @@
 .PHONY: tag push
 
-BASE=alpine:edge
+ORG?=linuxkit
 IMAGE=alpine
+BASE=alpine:edge
 
 default: push
 
@@ -15,16 +16,16 @@ hash: Dockerfile packages
 	docker run --rm $(IMAGE):build sh -c 'find /mirror -name '*.apk' -type f | xargs cat | cat /lib/apk/db/installed - | sha1sum' | sed 's/ .*//' > $@
 
 push: hash
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \
-		 docker push linuxkit/$(IMAGE):$(shell cat hash))
+	docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \
+		(docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash) && \
+		 docker push $(ORG)/$(IMAGE):$(shell cat hash))
 	docker run --rm $(IMAGE):build find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) > versions
 	docker rmi $(IMAGE):build
 	rm -f hash
 
 tag: hash
-	docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
-		docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
+	docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \
+		docker tag $(IMAGE):build $(ORG)/$(IMAGE):$(shell cat hash)
 	docker rmi $(IMAGE):build
 	rm -f hash
 
diff --git a/tools/alpine/packages b/tools/alpine/packages
index f60195a57..bd3e4cbbd 100644
--- a/tools/alpine/packages
+++ b/tools/alpine/packages
@@ -1,3 +1,6 @@
+alpine-baselayout
+alpine-keys
+apk-tools
 argp-standalone
 automake
 bash
@@ -12,6 +15,7 @@ build-base
 ca-certificates
 cdrkit
 cmake
+cryptsetup
 curl
 dhcpcd
 dosfstools
@@ -29,6 +33,7 @@ jq
 kmod
 libarchive-tools
 libc-dev
+libc-utils
 libelf-dev
 libseccomp-dev
 linux-headers
@@ -51,6 +56,7 @@ sfdisk
 squashfs-tools
 syslinux
 tar
+tini
 util-linux
 util-linux-dev
 vim
diff --git a/tools/alpine/versions b/tools/alpine/versions
index f65973699..f7037ab5a 100644
--- a/tools/alpine/versions
+++ b/tools/alpine/versions
@@ -7,22 +7,23 @@ argp-standalone-1.3-r2
 automake-1.15-r0
 bash-4.3.48-r1
 bc-1.06.95-r2
-binutils-2.28-r1
-binutils-dev-2.28-r1
-binutils-libs-2.28-r1
+binutils-2.28-r2
+binutils-dev-2.28-r2
+binutils-libs-2.28-r2
 bison-3.0.4-r0
-blkid-2.28.2-r1
+blkid-2.28.2-r2
 bsd-compat-headers-0.7.1-r0
 btrfs-progs-4.10.2-r0
 btrfs-progs-dev-4.10.2-r0
 btrfs-progs-libs-4.10.2-r0
 build-base-0.5-r0
-busybox-1.26.2-r2
+busybox-1.26.2-r3
 bzip2-1.0.6-r5
 ca-certificates-20161130-r2
 cdrkit-1.1.11-r2
 celt051-0.5.1.3-r0
 cmake-3.8.0-r0
+cryptsetup-1.7.5-r0
 cryptsetup-libs-1.7.5-r0
 curl-7.54.0-r0
 db-5.3.28-r0
@@ -34,17 +35,17 @@ e2fsprogs-extra-1.43.4-r0
 e2fsprogs-libs-1.43.4-r0
 expat-2.2.0-r0
 file-5.30-r0
-findmnt-2.28.2-r1
-flex-2.6.3-r1
+findmnt-2.28.2-r2
+flex-2.6.4-r1
 fortify-headers-0.8-r0
 g++-6.3.0-r4
 gcc-6.3.0-r4
-git-2.12.2-r1
+git-2.13.0-r0
 glib-2.52.1-r0
 gmp-6.1.2-r0
 gmp-dev-6.1.2-r0
-gnutls-3.5.10-r0
-go-1.7.4-r2
+gnutls-3.5.12-r0
+go-1.8.1-r0
 gummiboot-48.1-r0
 installkernel-3.5-r0
 iptables-1.6.1-r0
@@ -59,7 +60,7 @@ libarchive-3.3.1-r1
 libarchive-tools-3.3.1-r1
 libatomic-6.3.0-r4
 libattr-2.4.47-r6
-libblkid-2.28.2-r1
+libblkid-2.28.2-r2
 libburn-1.4.6-r0
 libbz2-1.0.6-r5
 libc-dev-0.7.1-r0
@@ -73,7 +74,7 @@ libedit-20170329.3.1-r2
 libelf-0.8.13-r2
 libelf-dev-0.8.13-r2
 libepoxy-1.4.1-r0
-libfdisk-2.28.2-r1
+libfdisk-2.28.2-r2
 libffi-3.2.1-r3
 libgcc-6.3.0-r4
 libgmpxx-6.1.2-r0
@@ -84,7 +85,7 @@ libisofs-1.4.6-r0
 libjpeg-turbo-1.5.1-r0
 libmagic-5.30-r0
 libmnl-1.0.4-r0
-libmount-2.28.2-r1
+libmount-2.28.2-r2
 libnfs-1.11.0-r0
 libnftnl-libs-1.0.7-r0
 libogg-1.3.2-r1
@@ -97,13 +98,13 @@ libressl2.5-libtls-2.5.4-r0
 libsasl-2.1.26-r10
 libseccomp-2.3.2-r0
 libseccomp-dev-2.3.2-r0
-libsmartcols-2.28.2-r1
+libsmartcols-2.28.2-r2
 libssh2-1.8.0-r1
 libstdc++-6.3.0-r4
 libtasn1-4.10-r0
 libunistring-0.9.7-r0
 libusb-1.0.21-r0
-libuuid-2.28.2-r1
+libuuid-2.28.2-r2
 libuv-1.11.0-r1
 linux-headers-4.4.6-r2
 lua5.2-libs-5.2.4-r2
@@ -135,7 +136,8 @@ patch-2.7.5-r1
 pcre-8.40-r2
 perl-5.24.1-r2
 pixman-0.34.0-r0
-pkgconf-1.3.5-r0
+pkgconf-1.3.6-r0
+popt-1.16-r6
 qemu-2.8.1-r1
 qemu-aarch64-2.8.1-r1
 qemu-arm-2.8.1-r1
@@ -146,15 +148,16 @@ qemu-system-x86_64-2.8.1-r1
 readline-6.3.008-r5
 scanelf-1.2.2-r0
 sed-4.4-r0
-sfdisk-2.28.2-r1
+sfdisk-2.28.2-r2
 snappy-1.1.4-r1
 spice-server-0.13.3-r1
 squashfs-tools-4.3-r3
 syslinux-6.04_pre1-r1
 tar-1.29-r1
+tini-0.14.0-r0
 usbredir-0.7-r2
-util-linux-2.28.2-r1
-util-linux-dev-2.28.2-r1
+util-linux-2.28.2-r2
+util-linux-dev-2.28.2-r2
 vde2-libs-2.3.2-r7
 vim-8.0.0595-r0
 wayland-1.13.0-r0