From dc8b40f0e1cb705bfeb4297bd443dc3cf51f4f8c Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 8 Nov 2016 10:09:10 +0000 Subject: [PATCH 1/2] Update base image - bind update - edge packages moved to 3.5 Signed-off-by: Justin Cormack --- alpine/Dockerfile | 2 +- alpine/base/alpine-base/Dockerfile | 4 ++-- alpine/base/alpine-base/packages | 4 ++-- alpine/base/alpine-base/repositories | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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 From db3be17a84c6bb0a30ab6268e8e91a864713ea8f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 8 Nov 2016 10:14:07 +0000 Subject: [PATCH 2/2] Remove bind tools We are not using these anywhere, busybox provides some of them. Avoids security warnings. Rework of #684 Signed-off-by: Justin Cormack --- alpine/Dockerfile | 2 +- alpine/base/alpine-base/Dockerfile | 1 - alpine/base/alpine-base/packages | 3 --- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index e5b856814..fb0feee4b 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-base:93c690d16e3743feb9b99aede0569582d7038548 +FROM mobylinux/alpine-base:c1301a5d6cba62693c16e3c712d32e8b3cb27d91 ENV ARCH=x86_64 diff --git a/alpine/base/alpine-base/Dockerfile b/alpine/base/alpine-base/Dockerfile index c41762e1e..256c78d2f 100644 --- a/alpine/base/alpine-base/Dockerfile +++ b/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 \ diff --git a/alpine/base/alpine-base/packages b/alpine/base/alpine-base/packages index 58955d5e2..30d2900a0 100644 --- a/alpine/base/alpine-base/packages +++ b/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_p4-r0 -bind-tools 9.10.4_p4-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