Switch to alpine 3.5

mblaschke · mblaschke · commit 62c52b80da0d · 2017-01-08T22:00:05.000+01:00
diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile
@@ -3,7 +3,7 @@
 #    -- automatically generated  --
 #+++++++++++++++++++++++++++++++++++++++
 
-FROM alpine:3.4
+FROM alpine:3.5
 
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
@@ -36,7 +36,7 @@ RUN set -x \
         python-dev \
         py-setuptools \
         py-crypto \
-        py-pip \
+        py2-pip \
         py-cparser \
         py-cryptography \
         py-markupsafe \
diff --git a/docker/bootstrap/alpine-3/Dockerfile.jinja2 b/docker/bootstrap/alpine-3/Dockerfile.jinja2
@@ -1,4 +1,4 @@
-{{ docker.fromOfficial("alpine", "3.4") }}
+{{ docker.fromOfficial("alpine", "3.5") }}
 
 {{ docker.version() }}
 
diff --git a/template/Dockerfile/images/bootstrap.jinja2 b/template/Dockerfile/images/bootstrap.jinja2
@@ -19,7 +19,7 @@ RUN set -x \
         python-dev \
         py-setuptools \
         py-crypto \
-        py-pip \
+        py2-pip \
         py-cparser \
         py-cryptography \
         py-markupsafe \
