From 50215b9c6c73d0e9dd0529a72ca52a2e0da1400a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Sat, 14 Jan 2017 09:41:12 +0000 Subject: [PATCH] Update to golang:1.7-alpine3.5 images Now there is an Alpine 3.5 variant of the Go 1.7 images, use this. fix #972 Note updated the containers/binfmt image as this will be converted to go-compile shortly, at which point alpine-build-go can be removed. Signed-off-by: Justin Cormack --- alpine/base/alpine-build-go/Dockerfile | 4 ++-- alpine/base/alpine-build-go/Makefile | 2 +- alpine/base/go-compile/Dockerfile | 2 +- alpine/base/go-compile/Makefile | 2 +- alpine/packages/diagnostics/Makefile | 4 ++-- alpine/packages/proxy/Makefile | 4 ++-- alpine/packages/vsudd/Makefile | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alpine/base/alpine-build-go/Dockerfile b/alpine/base/alpine-build-go/Dockerfile index 3c67bdf18..64c46a426 100644 --- a/alpine/base/alpine-build-go/Dockerfile +++ b/alpine/base/alpine-build-go/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:1.7-alpine +FROM golang:1.7-alpine3.5 RUN apk update && apk add --no-cache build-base git # Get linting tools RUN go get -u github.com/golang/lint/golint # Get the linting script and place in PATH -COPY lint.sh /usr/bin/lint.sh \ No newline at end of file +COPY lint.sh /usr/bin/lint.sh diff --git a/alpine/base/alpine-build-go/Makefile b/alpine/base/alpine-build-go/Makefile index 12f57acc4..547644dec 100644 --- a/alpine/base/alpine-build-go/Makefile +++ b/alpine/base/alpine-build-go/Makefile @@ -1,6 +1,6 @@ .PHONY: tag push -BASE=golang:1.7-alpine +BASE=golang:1.7-alpine3.5 IMAGE=alpine-build-go default: push diff --git a/alpine/base/go-compile/Dockerfile b/alpine/base/go-compile/Dockerfile index 5e942b91e..02b21d7b8 100644 --- a/alpine/base/go-compile/Dockerfile +++ b/alpine/base/go-compile/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.7-alpine +FROM golang:1.7-alpine3.5 RUN apk update && apk add --no-cache build-base git RUN go get -u github.com/golang/lint/golint diff --git a/alpine/base/go-compile/Makefile b/alpine/base/go-compile/Makefile index 11cf6feac..fd8a5f488 100644 --- a/alpine/base/go-compile/Makefile +++ b/alpine/base/go-compile/Makefile @@ -1,6 +1,6 @@ .PHONY: tag push -BASE=golang:1.7-alpine +BASE=golang:1.7-alpine3.5 IMAGE=go-compile default: push diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile index b3f6858b4..b46da55bb 100644 --- a/alpine/packages/diagnostics/Makefile +++ b/alpine/packages/diagnostics/Makefile @@ -1,5 +1,5 @@ -# Tag: 470f68ec32e016484fb8e0bcc2f06cd3f201ea68 -GO_COMPILE=mobylinux/go-compile@sha256:b723c0e95a6293300392e57d6ab52574f9217e2410b390a24cbfc4f9070edb6b +# Tag: 9c777a22fd84f08e1ea342c0b4ebabfb09fca086 +GO_COMPILE=mobylinux/go-compile@sha256:5e7f1909b0316261653d84f73aeb9188ef20d06b1ecf92eaa4402b32221adfba default: usr/bin/diagnostics-server diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile index 5db3a144d..fe172f54d 100644 --- a/alpine/packages/proxy/Makefile +++ b/alpine/packages/proxy/Makefile @@ -1,5 +1,5 @@ -# Tag: 470f68ec32e016484fb8e0bcc2f06cd3f201ea68 -GO_COMPILE=mobylinux/go-compile@sha256:b723c0e95a6293300392e57d6ab52574f9217e2410b390a24cbfc4f9070edb6b +# Tag: 9c777a22fd84f08e1ea342c0b4ebabfb09fca086 +GO_COMPILE=mobylinux/go-compile@sha256:5e7f1909b0316261653d84f73aeb9188ef20d06b1ecf92eaa4402b32221adfba all: usr/bin/slirp-proxy sbin/proxy-vsockd diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile index d976e289c..b4d64175a 100644 --- a/alpine/packages/vsudd/Makefile +++ b/alpine/packages/vsudd/Makefile @@ -1,5 +1,5 @@ -# Tag: 470f68ec32e016484fb8e0bcc2f06cd3f201ea68 -GO_COMPILE=mobylinux/go-compile@sha256:b723c0e95a6293300392e57d6ab52574f9217e2410b390a24cbfc4f9070edb6b +# Tag: 9c777a22fd84f08e1ea342c0b4ebabfb09fca086 +GO_COMPILE=mobylinux/go-compile@sha256:5e7f1909b0316261653d84f73aeb9188ef20d06b1ecf92eaa4402b32221adfba default: sbin/vsudd