From d435d5115bae90d0426c453c2e28a5aa086e0f6f Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 20 Oct 2016 13:17:16 +0100 Subject: [PATCH 1/3] Update to Go 1.7.3 Signed-off-by: Justin Cormack --- alpine/packages/diagnostics/Dockerfile | 2 +- alpine/packages/proxy/Dockerfile | 2 +- alpine/packages/vsudd/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alpine/packages/diagnostics/Dockerfile b/alpine/packages/diagnostics/Dockerfile index c92fd1072..9db5060a1 100644 --- a/alpine/packages/diagnostics/Dockerfile +++ b/alpine/packages/diagnostics/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:e726e12b5eea95a4e7aa537e416139d52040c68b +FROM mobylinux/alpine-build-go:78d9a136c632c66f0767e11ce3c661989d706f21 COPY ./ /go/src/diagnostics-server/ diff --git a/alpine/packages/proxy/Dockerfile b/alpine/packages/proxy/Dockerfile index a13958445..42ce04f93 100644 --- a/alpine/packages/proxy/Dockerfile +++ b/alpine/packages/proxy/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:e726e12b5eea95a4e7aa537e416139d52040c68b +FROM mobylinux/alpine-build-go:78d9a136c632c66f0767e11ce3c661989d706f21 COPY ./ /go/src/proxy/ diff --git a/alpine/packages/vsudd/Dockerfile b/alpine/packages/vsudd/Dockerfile index 5b1a8fa0a..b1e75e63a 100644 --- a/alpine/packages/vsudd/Dockerfile +++ b/alpine/packages/vsudd/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-go:e726e12b5eea95a4e7aa537e416139d52040c68b +FROM mobylinux/alpine-build-go:78d9a136c632c66f0767e11ce3c661989d706f21 COPY ./ /go/src/vsudd/ From e34c320abdfe6334e61e624af10a5b5729e59dec Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 20 Oct 2016 13:20:00 +0100 Subject: [PATCH 2/3] Update base image with Musl bugfix Signed-off-by: Justin Cormack --- alpine/Dockerfile | 2 +- alpine/base/alpine-base/packages | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 9e6f39521..67ed851f3 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-base:a789b97cc7b77b84fc341e1643b21b000823ee05 +FROM mobylinux/alpine-base:58a92e442c3825d28fb41271525e77166a81e699 ENV ARCH=x86_64 diff --git a/alpine/base/alpine-base/packages b/alpine/base/alpine-base/packages index d62244286..efbc26d3b 100644 --- a/alpine/base/alpine-base/packages +++ b/alpine/base/alpine-base/packages @@ -42,8 +42,8 @@ libverto 0.2.5-r0 lvm2 2.02.154-r0 lvm2-libs 2.02.154-r0 make 4.1-r1 -musl 1.1.14-r12 -musl-utils 1.1.14-r12 +musl 1.1.14-r13 +musl-utils 1.1.14-r13 openrc 0.21-r2 openssh 7.2_p2-r3 openssh-client 7.2_p2-r3 From 2409adfe0aab0adc978fd5efdc40e522c774539e Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Thu, 20 Oct 2016 13:23:12 +0100 Subject: [PATCH 3/3] update C build base images for Musl update Signed-off-by: Justin Cormack --- alpine/kernel/Dockerfile | 2 +- alpine/packages/9pmount-vsock/Dockerfile | 2 +- alpine/packages/nc-vsock/Dockerfile | 2 +- alpine/packages/tap-vsockd/Dockerfile | 2 +- alpine/packages/transfused/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/alpine/kernel/Dockerfile b/alpine/kernel/Dockerfile index ee0daba10..ff9c9d7c5 100644 --- a/alpine/kernel/Dockerfile +++ b/alpine/kernel/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:f97e13b3a7339af5da5d620fc053c6a6c81b00a6 +FROM mobylinux/alpine-build-c:7303e33e9dcd5276b8bb5269644a9bf3354008c8 ARG KERNEL_VERSION=4.8.2 diff --git a/alpine/packages/9pmount-vsock/Dockerfile b/alpine/packages/9pmount-vsock/Dockerfile index 9fa27054a..6a0739fcc 100644 --- a/alpine/packages/9pmount-vsock/Dockerfile +++ b/alpine/packages/9pmount-vsock/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:f97e13b3a7339af5da5d620fc053c6a6c81b00a6 +FROM mobylinux/alpine-build-c:7303e33e9dcd5276b8bb5269644a9bf3354008c8 COPY . /9pmount-vsock diff --git a/alpine/packages/nc-vsock/Dockerfile b/alpine/packages/nc-vsock/Dockerfile index 8a93e6793..f978589dc 100644 --- a/alpine/packages/nc-vsock/Dockerfile +++ b/alpine/packages/nc-vsock/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:f97e13b3a7339af5da5d620fc053c6a6c81b00a6 +FROM mobylinux/alpine-build-c:7303e33e9dcd5276b8bb5269644a9bf3354008c8 COPY . /nc-vsock diff --git a/alpine/packages/tap-vsockd/Dockerfile b/alpine/packages/tap-vsockd/Dockerfile index 9d260a249..91179916b 100644 --- a/alpine/packages/tap-vsockd/Dockerfile +++ b/alpine/packages/tap-vsockd/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:f97e13b3a7339af5da5d620fc053c6a6c81b00a6 +FROM mobylinux/alpine-build-c:7303e33e9dcd5276b8bb5269644a9bf3354008c8 COPY . /tap-vsockd diff --git a/alpine/packages/transfused/Dockerfile b/alpine/packages/transfused/Dockerfile index 03f7588f7..71db4fe6d 100644 --- a/alpine/packages/transfused/Dockerfile +++ b/alpine/packages/transfused/Dockerfile @@ -1,4 +1,4 @@ -FROM mobylinux/alpine-build-c:f97e13b3a7339af5da5d620fc053c6a6c81b00a6 +FROM mobylinux/alpine-build-c:7303e33e9dcd5276b8bb5269644a9bf3354008c8 COPY . /transfused