Merge pull request #700 from justincormack/baseup

Update base image

alpine/Dockerfile

@@ -1,4 +1,4 @@
-FROM mobylinux/alpine-base:2d4cde2e18d032f5e85c4f4239ab6d906864401c
+FROM mobylinux/alpine-base:c1301a5d6cba62693c16e3c712d32e8b3cb27d91
 
 ENV ARCH=x86_64
 

alpine/base/alpine-base/Dockerfile

@@ -6,7 +6,6 @@ RUN \
   apk update && apk upgrade && \
   apk add --no-cache \
   alpine-conf \
-  bind-tools \
   busybox-initscripts \
   chrony \
   cifs-utils \
@@ -16,9 +15,9 @@ RUN \
   e2fsprogs-extra \
   fuse \
   git \
-  hvtools@edgetesting \
+  hvtools@nextmain \
   iptables \
-  ipvsadm@edgetesting \
+  ipvsadm@nextmain \
   jq \
   lvm2 \
   make \

alpine/base/alpine-base/packages

@@ -2,8 +2,6 @@ alpine-baselayout 3.0.3-r0
 alpine-conf 3.4.1-r5
 alpine-keys 1.1-r0
 apk-tools 2.6.7-r0
-bind-libs 9.10.4_p3-r0
-bind-tools 9.10.4_p3-r0
 busybox 1.24.2-r12
 busybox-initscripts 3.0-r3
 ca-certificates 20160104-r4
@@ -32,7 +30,6 @@ libcom_err 1.43-r0
 libcrypto1.0 1.0.2j-r0
 libcurl 7.51.0-r0
 libfdisk 2.28-r3
-libgcc 5.3.0-r0
 libmnl 1.0.3-r1
 libnftnl-libs 1.0.5-r0
 libnl 1.1.4-r0

alpine/base/alpine-base/repositories

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