From 8bfb40ce54f15603ec2e5eb820aed46900805c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 30 Aug 2018 11:37:53 +0200 Subject: [PATCH] Various Docker image upgrades, read the entire commit message! MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Ubuntu 17.10 → 18.04. - Python 3.6.3 → 3.6.6. - Use `DEBIAN_FRONTEND=noninteractive` to prevent prompts during installation. - Install `tzdata` in the base image as it's required by subimages. - Correctly set maintainer in Dockerfile. --- docker/1_base/Dockerfile | 14 ++++++++----- docker/2_buildpy/Python-3.6.4.tar.xz.md5 | 1 - docker/2_buildpy/Python-3.6.6.tar.xz.md5 | 1 + docker/2_buildpy/buildpy.docker | 16 +++++++-------- docker/2_buildpy/includepy.docker | 2 +- docker/3_buildwheels/Dockerfile | 6 ++++-- docker/4_run/Dockerfile | 26 +++++++++++++----------- 7 files changed, 37 insertions(+), 29 deletions(-) delete mode 100644 docker/2_buildpy/Python-3.6.4.tar.xz.md5 create mode 100644 docker/2_buildpy/Python-3.6.6.tar.xz.md5 diff --git a/docker/1_base/Dockerfile b/docker/1_base/Dockerfile index f4a6105..9add39c 100644 --- a/docker/1_base/Dockerfile +++ b/docker/1_base/Dockerfile @@ -1,6 +1,10 @@ -FROM ubuntu:17.10 -MAINTAINER Francesco Siddi +FROM ubuntu:18.04 +LABEL maintainer="Sybren A. Stüvel " -RUN apt-get update && apt-get install -qyy \ - -o APT::Install-Recommends=false -o APT::Install-Suggests=false \ - openssl ca-certificates +RUN set -ex; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install \ + -qyy -o APT::Install-Recommends=false -o APT::Install-Suggests=false \ + tzdata openssl ca-certificates locales; \ + locale-gen en_US.UTF-8 en_GB.UTF-8 nl_NL.UTF-8 +ENV LANG en_US.UTF-8 diff --git a/docker/2_buildpy/Python-3.6.4.tar.xz.md5 b/docker/2_buildpy/Python-3.6.4.tar.xz.md5 deleted file mode 100644 index 1e2e4d5..0000000 --- a/docker/2_buildpy/Python-3.6.4.tar.xz.md5 +++ /dev/null @@ -1 +0,0 @@ -1325134dd525b4a2c3272a1a0214dd54 Python-3.6.4.tar.xz diff --git a/docker/2_buildpy/Python-3.6.6.tar.xz.md5 b/docker/2_buildpy/Python-3.6.6.tar.xz.md5 new file mode 100644 index 0000000..69c1a84 --- /dev/null +++ b/docker/2_buildpy/Python-3.6.6.tar.xz.md5 @@ -0,0 +1 @@ +c3f30a0aff425dda77d19e02f420d6ba Python-3.6.6.tar.xz diff --git a/docker/2_buildpy/buildpy.docker b/docker/2_buildpy/buildpy.docker index 5372457..523e47c 100644 --- a/docker/2_buildpy/buildpy.docker +++ b/docker/2_buildpy/buildpy.docker @@ -1,9 +1,9 @@ FROM pillar_base -LABEL maintainer Sybren A. Stüvel +LABEL maintainer="Sybren A. Stüvel " RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list && \ apt-get update && \ - apt-get install -qy \ + DEBIAN_FRONTEND=noninteractive apt-get install -qy \ build-essential \ apache2-dev \ checkinstall \ @@ -11,13 +11,13 @@ RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list && \ RUN apt-get build-dep -y python3.6 -ADD Python-3.6.4.tar.xz.md5 /Python-3.6.4.tar.xz.md5 +ADD Python-3.6.6.tar.xz.md5 /Python-3.6.6.tar.xz.md5 # Install Python sources -RUN curl -O https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz && \ - md5sum -c Python-3.6.4.tar.xz.md5 && \ - tar xf Python-3.6.4.tar.xz && \ - rm -v Python-3.6.4.tar.xz +RUN curl -O https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz && \ + md5sum -c Python-3.6.6.tar.xz.md5 && \ + tar xf Python-3.6.6.tar.xz && \ + rm -v Python-3.6.6.tar.xz # Install mod-wsgi sources RUN mkdir -p /dpkg && cd /dpkg && apt-get source libapache2-mod-wsgi-py3 @@ -32,4 +32,4 @@ RUN echo /opt/python/lib > /etc/ld.so.conf.d/python.conf RUN ldconfig ENV PATH=/opt/python/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -ENV PYTHONSOURCE=/Python-3.6.4 +ENV PYTHONSOURCE=/Python-3.6.6 diff --git a/docker/2_buildpy/includepy.docker b/docker/2_buildpy/includepy.docker index 09716dd..5ba2661 100644 --- a/docker/2_buildpy/includepy.docker +++ b/docker/2_buildpy/includepy.docker @@ -1,5 +1,5 @@ FROM pillar_base -LABEL maintainer Sybren A. Stüvel +LABEL maintainer="Sybren A. Stüvel " ADD python /opt/python diff --git a/docker/3_buildwheels/Dockerfile b/docker/3_buildwheels/Dockerfile index cbc7dc2..efbde1d 100644 --- a/docker/3_buildwheels/Dockerfile +++ b/docker/3_buildwheels/Dockerfile @@ -1,7 +1,9 @@ FROM armadillica/pillar_py:3.6 -LABEL maintainer Sybren A. Stüvel +LABEL maintainer="Sybren A. Stüvel " -RUN apt-get update && apt-get install -qy \ +RUN set -ex; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -qy \ git \ build-essential \ checkinstall \ diff --git a/docker/4_run/Dockerfile b/docker/4_run/Dockerfile index 865f2de..1e59b89 100755 --- a/docker/4_run/Dockerfile +++ b/docker/4_run/Dockerfile @@ -1,17 +1,19 @@ FROM armadillica/pillar_py:3.6 -LABEL maintainer Sybren A. Stüvel +LABEL maintainer="Sybren A. Stüvel " -RUN apt-get update && apt-get install -qyy \ --o APT::Install-Recommends=false -o APT::Install-Suggests=false \ -git \ -apache2 \ -libapache2-mod-xsendfile \ -libjpeg8 \ -libtiff5 \ -ffmpeg \ -rsyslog logrotate \ -nano vim-tiny curl \ -&& rm -rf /var/lib/apt/lists/* +RUN set -ex; \ + apt-get update; \ + DEBIAN_FRONTEND=noninteractive apt-get install -qy \ + -o APT::Install-Recommends=false -o APT::Install-Suggests=false \ + git \ + apache2 \ + libapache2-mod-xsendfile \ + libjpeg8 \ + libtiff5 \ + ffmpeg \ + rsyslog logrotate \ + nano vim-tiny curl; \ + rm -rf /var/lib/apt/lists/* RUN ln -s /usr/bin/vim.tiny /usr/bin/vim