Skip to content

Commit a8eaaf4

Browse files
tianontianon
committed
Remove Alpine 3.4 variants (EOL)
See https://wiki.alpinelinux.org/wiki/Alpine_Linux:Releases
1 parent dd864c1 commit a8eaaf4

File tree

7 files changed

+22
-278
lines changed

7 files changed

+22
-278
lines changed

‎.travis.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,20 @@ env:
1111
- VERSION=3.6 VARIANT=jessie/slim
1212
- VERSION=3.6 VARIANT=alpine3.7
1313
- VERSION=3.6 VARIANT=alpine3.6
14-
- VERSION=3.6 VARIANT=alpine3.4
1514
- VERSION=3.5 VARIANT=jessie
1615
- VERSION=3.5 VARIANT=jessie/slim
17-
- VERSION=3.5 VARIANT=alpine3.4
16+
- VERSION=3.5 VARIANT=alpine3.7
1817
- VERSION=3.4 VARIANT=jessie
1918
- VERSION=3.4 VARIANT=jessie/slim
2019
- VERSION=3.4 VARIANT=wheezy
21-
- VERSION=3.4 VARIANT=alpine3.4
20+
- VERSION=3.4 VARIANT=alpine3.7
2221
- VERSION=2.7 VARIANT=stretch
2322
- VERSION=2.7 VARIANT=stretch/slim
2423
- VERSION=2.7 VARIANT=jessie
2524
- VERSION=2.7 VARIANT=jessie/slim
2625
- VERSION=2.7 VARIANT=wheezy
2726
- VERSION=2.7 VARIANT=alpine3.7
2827
- VERSION=2.7 VARIANT=alpine3.6
29-
- VERSION=2.7 VARIANT=alpine3.4
3028

3129
install:
3230
- git clone https://github.com/docker-library/official-images.git ~/official-images

‎2.7/alpine3.4/Dockerfile‎

Lines changed: 0 additions & 113 deletions
This file was deleted.

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.4
7+
FROM alpine:3.7
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH
@@ -23,7 +23,7 @@ ENV PYTHON_VERSION 3.4.8
2323
RUN set -ex \
2424
&& apk add --no-cache --virtual .fetch-deps \
2525
gnupg \
26-
openssl \
26+
libressl \
2727
tar \
2828
xz \
2929
\
@@ -46,11 +46,13 @@ RUN set -ex \
4646
gdbm-dev \
4747
libc-dev \
4848
libffi-dev \
49+
libnsl-dev \
50+
libtirpc-dev \
4951
linux-headers \
5052
make \
5153
ncurses-dev \
52-
openssl \
53-
openssl-dev \
54+
libressl \
55+
libressl-dev \
5456
pax-utils \
5557
readline-dev \
5658
sqlite-dev \
@@ -106,7 +108,7 @@ ENV PYTHON_PIP_VERSION 10.0.1
106108

107109
RUN set -ex; \
108110
\
109-
apk add --no-cache --virtual .fetch-deps openssl; \
111+
apk add --no-cache --virtual .fetch-deps libressl; \
110112
\
111113
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
112114
\

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# PLEASE DO NOT EDIT IT DIRECTLY.
55
#
66

7-
FROM alpine:3.4
7+
FROM alpine:3.7
88

99
# ensure local python is preferred over distribution python
1010
ENV PATH /usr/local/bin:$PATH
@@ -23,7 +23,7 @@ ENV PYTHON_VERSION 3.5.5
2323
RUN set -ex \
2424
&& apk add --no-cache --virtual .fetch-deps \
2525
gnupg \
26-
openssl \
26+
libressl \
2727
tar \
2828
xz \
2929
\
@@ -46,11 +46,13 @@ RUN set -ex \
4646
gdbm-dev \
4747
libc-dev \
4848
libffi-dev \
49+
libnsl-dev \
50+
libtirpc-dev \
4951
linux-headers \
5052
make \
5153
ncurses-dev \
52-
openssl \
53-
openssl-dev \
54+
libressl \
55+
libressl-dev \
5456
pax-utils \
5557
readline-dev \
5658
sqlite-dev \
@@ -106,7 +108,7 @@ ENV PYTHON_PIP_VERSION 10.0.1
106108

107109
RUN set -ex; \
108110
\
109-
apk add --no-cache --virtual .fetch-deps openssl; \
111+
apk add --no-cache --virtual .fetch-deps libressl; \
110112
\
111113
wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \
112114
\

‎3.6/alpine3.4/Dockerfile‎

Lines changed: 0 additions & 130 deletions
This file was deleted.

0 commit comments

Comments
 (0)