aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2016-07-22 17:18:22 +0800
committerGitHub <noreply@github.com>2016-07-22 17:18:22 +0800
commitfb81bc32912e61ae83cd6962172c47c011f979ac (patch)
tree60216d70e39aa156f32758345eafacff06e8721e
parentc646d287f84e50b9c4bd9cabdfa7773035f508b7 (diff)
parent51d4539a79440de8a56bea398de5a465c96c3e46 (diff)
downloadgo-tangerine-fb81bc32912e61ae83cd6962172c47c011f979ac.tar
go-tangerine-fb81bc32912e61ae83cd6962172c47c011f979ac.tar.gz
go-tangerine-fb81bc32912e61ae83cd6962172c47c011f979ac.tar.bz2
go-tangerine-fb81bc32912e61ae83cd6962172c47c011f979ac.tar.lz
go-tangerine-fb81bc32912e61ae83cd6962172c47c011f979ac.tar.xz
go-tangerine-fb81bc32912e61ae83cd6962172c47c011f979ac.tar.zst
go-tangerine-fb81bc32912e61ae83cd6962172c47c011f979ac.zip
Merge pull request #2851 from yep/alpine-3-4
containers/docker: update to alpine 3.4
-rw-r--r--containers/docker/develop-alpine/Dockerfile2
-rw-r--r--containers/docker/master-alpine/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/containers/docker/develop-alpine/Dockerfile b/containers/docker/develop-alpine/Dockerfile
index 6b00bf253..70aee9f0f 100644
--- a/containers/docker/develop-alpine/Dockerfile
+++ b/containers/docker/develop-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4
RUN \
apk add --update go git make gcc musl-dev && \
diff --git a/containers/docker/master-alpine/Dockerfile b/containers/docker/master-alpine/Dockerfile
index ade4caf6f..ffccd43e2 100644
--- a/containers/docker/master-alpine/Dockerfile
+++ b/containers/docker/master-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:3.4
RUN \
apk add --update go git make gcc musl-dev && \