Skip to content

Remove Alpine 3.4 variants (EOL) #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2018
Merged

Remove Alpine 3.4 variants (EOL) #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
113 changes: 0 additions & 113 deletions 2.7/alpine3.4/Dockerfile
View file
Open in desktop

This file was deleted.

12 changes: 7 additions & 5 deletions 3.4/alpine3.4/Dockerfile → 3.4/alpine3.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
\
Expand All @@ -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 \
Expand Down Expand Up @@ -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'; \
\
Expand Down
12 changes: 7 additions & 5 deletions 3.5/alpine3.4/Dockerfile → 3.5/alpine3.7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
\
Expand All @@ -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 \
Expand Down Expand Up @@ -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'; \
\
Expand Down
130 changes: 0 additions & 130 deletions 3.6/alpine3.4/Dockerfile
View file
Open in desktop

This file was deleted.

Loading