diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 39a4b98ec..e5b856814 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-base:2d4cde2e18d032f5e85c4f4239ab6d906864401c +FROM mobylinux/alpine-base:93c690d16e3743feb9b99aede0569582d7038548 ENV ARCH=x86_64 diff --git a/alpine/base/alpine-base/Dockerfile b/alpine/base/alpine-base/Dockerfile index 673479934..c41762e1e 100644 --- a/alpine/base/alpine-base/Dockerfile +++ b/alpine/base/alpine-base/Dockerfile @@ -16,9 +16,9 @@ RUN \ e2fsprogs-extra \ fuse \ git \ - hvtools@edgetesting \ + hvtools@nextmain \ iptables \ - ipvsadm@edgetesting \ + ipvsadm@nextmain \ jq \ lvm2 \ make \ diff --git a/alpine/base/alpine-base/packages b/alpine/base/alpine-base/packages index 438cc1e2d..58955d5e2 100644 --- a/alpine/base/alpine-base/packages +++ b/alpine/base/alpine-base/packages @@ -2,8 +2,8 @@ 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 +bind-libs 9.10.4_p4-r0 +bind-tools 9.10.4_p4-r0 busybox 1.24.2-r12 busybox-initscripts 3.0-r3 ca-certificates 20160104-r4 diff --git a/alpine/base/alpine-base/repositories b/alpine/base/alpine-base/repositories index 99c18acce..f66f90566 100644 --- a/alpine/base/alpine-base/repositories +++ b/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