From 67e7d70195c46f16116a57307c364167cb1302f6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 27 Mar 2019 08:28:29 -0700 Subject: [PATCH] Remove wheezy (EOL) --- .travis.yml | 2 - 2.7/wheezy/Dockerfile | 84 ----------------------------------- generate-stackbrew-library.sh | 2 +- update.sh | 8 +--- 4 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 2.7/wheezy/Dockerfile diff --git a/.travis.yml b/.travis.yml index 5c7761a25..d42825ed9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,8 +61,6 @@ matrix: env: VERSION=2.7 VARIANT=jessie - os: linux env: VERSION=2.7 VARIANT=jessie/slim - - os: linux - env: VERSION=2.7 VARIANT=wheezy - os: linux env: VERSION=2.7 VARIANT=alpine3.9 - os: linux diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile deleted file mode 100644 index f80e11e64..000000000 --- a/2.7/wheezy/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "update.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:wheezy - -# ensure local python is preferred over distribution python -ENV PATH /usr/local/bin:$PATH - -# http://bugs.python.org/issue19846 -# > At the moment, setting "LANG=C" on a Linux system *fundamentally breaks Python 3*, and that's not OK. -ENV LANG C.UTF-8 -# https://github.com/docker-library/python/issues/147 -ENV PYTHONIOENCODING UTF-8 - -# extra dependencies (over what buildpack-deps already includes) -RUN apt-get update && apt-get install -y --no-install-recommends \ - tk-dev \ - && rm -rf /var/lib/apt/lists/* - -ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF -ENV PYTHON_VERSION 2.7.16 - -RUN set -ex \ - \ - && wget -O python.tar.xz "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz" \ - && wget -O python.tar.xz.asc "https://www.python.org/ftp/python/${PYTHON_VERSION%%[a-z]*}/Python-$PYTHON_VERSION.tar.xz.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ - && gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \ - && gpg --batch --verify python.tar.xz.asc python.tar.xz \ - && { command -v gpgconf > /dev/null && gpgconf --kill all || :; } \ - && rm -rf "$GNUPGHOME" python.tar.xz.asc \ - && mkdir -p /usr/src/python \ - && tar -xJC /usr/src/python --strip-components=1 -f python.tar.xz \ - && rm python.tar.xz \ - \ - && cd /usr/src/python \ - && gnuArch="$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)" \ - && ./configure \ - --build="$gnuArch" \ - --enable-shared \ - --enable-unicode=ucs4 \ - && make -j "$(nproc)" \ - && make install \ - && ldconfig \ - \ - && find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' + \ - && rm -rf /usr/src/python \ - \ - && python2 --version - -# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value ''" -ENV PYTHON_PIP_VERSION 19.0.3 - -RUN set -ex; \ - \ - wget -O get-pip.py 'https://bootstrap.pypa.io/get-pip.py'; \ - \ - python get-pip.py \ - --disable-pip-version-check \ - --no-cache-dir \ - "pip==$PYTHON_PIP_VERSION" \ - ; \ - pip --version; \ - \ - find /usr/local -depth \ - \( \ - \( -type d -a \( -name test -o -name tests \) \) \ - -o \ - \( -type f -a \( -name '*.pyc' -o -name '*.pyo' \) \) \ - \) -exec rm -rf '{}' +; \ - rm -f get-pip.py - -# install "virtualenv", since the vast majority of users of this image will want it -RUN pip install --no-cache-dir virtualenv - -CMD ["python2"] diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index c8b4ecdaa..2324462d8 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -76,7 +76,7 @@ for version in "${versions[@]}"; do rcVersion="${version%-rc}" for v in \ - {stretch,jessie,wheezy}{,/slim} \ + {stretch,jessie}{,/slim} \ alpine{3.9,3.8} \ windows/windowsservercore-{ltsc2016,1709,1803,1809} \ ; do diff --git a/update.sh b/update.sh index c7e82f879..342de8541 100755 --- a/update.sh +++ b/update.sh @@ -114,7 +114,7 @@ for version in "${versions[@]}"; do for v in \ alpine{3.8,3.9} \ - {wheezy,jessie,stretch}{/slim,} \ + {jessie,stretch}{/slim,} \ windows/windowsservercore-{1809,1803,1709,ltsc2016} \ ; do dir="$version/$v" @@ -148,10 +148,6 @@ for version in "${versions[@]}"; do -e 's!^(FROM (debian|buildpack-deps|alpine|mcr[.]microsoft[.]com/[^:]+)):.*!\1:'"$tag"'!' \ "$dir/Dockerfile" - case "$variant" in - wheezy) sed -ri -e 's/dpkg-architecture --query /dpkg-architecture -q/g' "$dir/Dockerfile" ;; - esac - # Alpine < 3.9 used libressl instead of openssl if [ "$v" = 'alpine3.8' ]; then sed -ri -e 's/openssl/libressl/g' "$dir/Dockerfile" @@ -180,7 +176,7 @@ for version in "${versions[@]}"; do 3.[5-6]*) sed -ri -e '/uuid-dev/d' "$dir/Dockerfile" ;;& # (other Debian variants need to match later blocks) - */stretch | */jessie | */wheezy) + */stretch | */jessie) # buildpack-deps already includes libssl-dev sed -ri -e '/libssl-dev/d' "$dir/Dockerfile" ;;