Merge pull request #290 from infosiftr/alpine3.4

Remove Alpine 3.4 variants (EOL)

Author: yosifkit

.travis.yml

@@ -11,22 +11,20 @@ env:
   - VERSION=3.6 VARIANT=jessie/slim
   - VERSION=3.6 VARIANT=alpine3.7
   - VERSION=3.6 VARIANT=alpine3.6
-  - VERSION=3.6 VARIANT=alpine3.4
   - VERSION=3.5 VARIANT=jessie
   - VERSION=3.5 VARIANT=jessie/slim
-  - VERSION=3.5 VARIANT=alpine3.4
+  - VERSION=3.5 VARIANT=alpine3.7
   - VERSION=3.4 VARIANT=jessie
   - VERSION=3.4 VARIANT=jessie/slim
   - VERSION=3.4 VARIANT=wheezy
-  - VERSION=3.4 VARIANT=alpine3.4
+  - VERSION=3.4 VARIANT=alpine3.7
   - VERSION=2.7 VARIANT=stretch
   - VERSION=2.7 VARIANT=stretch/slim
   - VERSION=2.7 VARIANT=jessie
   - VERSION=2.7 VARIANT=jessie/slim
   - VERSION=2.7 VARIANT=wheezy
   - VERSION=2.7 VARIANT=alpine3.7
   - VERSION=2.7 VARIANT=alpine3.6
-  - VERSION=2.7 VARIANT=alpine3.4
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images

2.7/alpine3.4/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -23,7 +23,7 @@ ENV PYTHON_VERSION 3.4.8
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 		tar \
 		xz \
 	\
@@ -46,11 +46,13 @@ RUN set -ex \
 		gdbm-dev \
 		libc-dev \
 		libffi-dev \
+		libnsl-dev \
+		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		openssl \
-		openssl-dev \
+		libressl \
+		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
@@ -106,7 +108,7 @@ ENV PYTHON_PIP_VERSION 10.0.1
 
 RUN set -ex; \
 	\
-	apk add --no-cache --virtual .fetch-deps openssl; \
+	apk add --no-cache --virtual .fetch-deps libressl; \
 	\
 	wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
 	\

3.4/alpine3.4/Dockerfile renamed to 3.4/alpine3.7/Dockerfile

@@ -4,7 +4,7 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 
-FROM alpine:3.4
+FROM alpine:3.7
 
 # ensure local python is preferred over distribution python
 ENV PATH /usr/local/bin:$PATH
@@ -23,7 +23,7 @@ ENV PYTHON_VERSION 3.5.5
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps \
 		gnupg \
-		openssl \
+		libressl \
 		tar \
 		xz \
 	\
@@ -46,11 +46,13 @@ RUN set -ex \
 		gdbm-dev \
 		libc-dev \
 		libffi-dev \
+		libnsl-dev \
+		libtirpc-dev \
 		linux-headers \
 		make \
 		ncurses-dev \
-		openssl \
-		openssl-dev \
+		libressl \
+		libressl-dev \
 		pax-utils \
 		readline-dev \
 		sqlite-dev \
@@ -106,7 +108,7 @@ ENV PYTHON_PIP_VERSION 10.0.1
 
 RUN set -ex; \
 	\
-	apk add --no-cache --virtual .fetch-deps openssl; \
+	apk add --no-cache --virtual .fetch-deps libressl; \
 	\
 	wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
 	\