Merge pull request #766 from justincormack/alpine-3.5-rc2

Update base image to Alpine 3.5-rc2

alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM mobylinux/alpine-base:6390ec17d39ecfc3b6edfec7a1f64e4a2d9c634c
+FROM mobylinux/alpine-base:50f80b04bfad0d23e44c6d4227bb045f39b42fae
 
 ENV ARCH=x86_64
 

alpine/base/alpine-base/Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:edge
 
 COPY repositories /etc/apk/
 
@@ -14,13 +14,13 @@ RUN \
   e2fsprogs-extra \
   fuse \
   git \
-  hvtools@nextmain \
+  hvtools \
   iptables \
   jq \
   openrc \
   openssh \
   openssh-client \
-  rng-tools@edgecommunity \
+  rng-tools@community \
   sfdisk \
   sysklogd \
   xz \

alpine/base/alpine-base/Makefile

@@ -1,6 +1,6 @@
 .PHONY: tag push
 
-BASE=alpine:3.4
+BASE=alpine:edge
 IMAGE=alpine-base
 
 default: push

alpine/base/alpine-base/packages

@@ -1,51 +1,53 @@
-alpine-baselayout 3.0.3-r0
-alpine-keys 1.1-r0
-apk-tools 2.6.7-r0
-busybox 1.24.2-r12
-busybox-initscripts 3.0-r3
-ca-certificates 20160104-r4
-chrony 2.3-r1
-cifs-utils 6.5-r0
-curl 7.51.0-r0
-dhcpcd 6.10.3-r1
-e2fsprogs 1.43-r0
-e2fsprogs-extra 1.43-r0
-e2fsprogs-libs 1.43-r0
-expat 2.1.1-r1
-fuse 2.9.6-r0
-git 2.8.3-r0
+alpine-baselayout 3.0.3-r2
+alpine-keys 1.3-r0
+apk-tools 2.6.8-r1
+busybox 1.25.1-r0
+busybox-initscripts 3.0-r6
+ca-certificates 20160104-r6
+chrony 2.4-r0
+cifs-utils 6.6-r0
+curl 7.51.0-r1
+dhcpcd 6.11.5-r0
+e2fsprogs 1.43.3-r0
+e2fsprogs-extra 1.43.3-r0
+e2fsprogs-libs 1.43.3-r0
+expat 2.2.0-r0
+fuse 2.9.7-r0
+git 2.10.2-r0
 hvtools 4.4.15-r0
 iptables 1.6.0-r0
-jq 1.5-r1
+jq 1.5-r3
 keyutils-libs 1.5.9-r1
 krb5-conf 1.0-r1
-krb5-libs 1.14.3-r0
-libblkid 2.28-r3
-libc-utils 0.7-r0
-libcap 2.25-r0
-libcom_err 1.43-r0
-libcrypto1.0 1.0.2j-r0
-libcurl 7.51.0-r0
-libfdisk 2.28-r3
-libmnl 1.0.3-r1
-libnftnl-libs 1.0.5-r0
-libsmartcols 2.28-r3
-libssh2 1.7.0-r0
-libssl1.0 1.0.2j-r0
-libuuid 2.28-r3
+krb5-libs 1.14.3-r1
+libblkid 2.28.2-r0
+libc-utils 0.7-r1
+libcap 2.25-r1
+libcom_err 1.43.3-r0
+libcurl 7.51.0-r1
+libfdisk 2.28.2-r0
+libmnl 1.0.4-r0
+libnftnl-libs 1.0.6-r0
+libressl 2.4.4-r0
+libressl2.4-libcrypto 2.4.4-r0
+libressl2.4-libssl 2.4.4-r0
+libsmartcols 2.28.2-r0
+libssh2 1.7.0-r2
+libuuid 2.28.2-r0
 libverto 0.2.5-r0
-musl 1.1.14-r14
-musl-utils 1.1.14-r14
-openrc 0.21-r2
-openssh 7.2_p2-r3
-openssh-client 7.2_p2-r3
-openssh-sftp-server 7.2_p2-r3
-pcre 8.38-r1
+musl 1.1.15-r5
+musl-utils 1.1.15-r5
+oniguruma 6.1.2-r0
+openrc 0.21.7-r2
+openssh 7.3_p1-r2
+openssh-client 7.3_p1-r2
+openssh-sftp-server 7.3_p1-r2
+pcre 8.39-r0
 rng-tools 5-r3
 scanelf 1.1.6-r0
-sfdisk 2.28-r3
+sfdisk 2.28.2-r0
 sysklogd 1.5.1-r0
-talloc 2.1.7-r0
+talloc 2.1.8-r0
 xz 5.2.2-r1
 xz-libs 5.2.2-r1
 zlib 1.2.8-r2

alpine/base/alpine-base/repositories

@@ -1,3 +1,2 @@
-http://dl-cdn.alpinelinux.org/alpine/v3.4/main
-@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community
-@nextmain http://dl-cdn.alpinelinux.org/alpine/v3.5/main
+http://dl-cdn.alpinelinux.org/alpine/v3.5/main
+@community http://dl-cdn.alpinelinux.org/alpine/v3.5/community