Various Docker image upgrades, read the entire commit message!
- 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.
This commit is contained in:
@@ -1,6 +1,10 @@
|
|||||||
FROM ubuntu:17.10
|
FROM ubuntu:18.04
|
||||||
MAINTAINER Francesco Siddi <francesco@blender.org>
|
LABEL maintainer="Sybren A. Stüvel <sybren@blender.studio>"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -qyy \
|
RUN set -ex; \
|
||||||
-o APT::Install-Recommends=false -o APT::Install-Suggests=false \
|
apt-get update; \
|
||||||
openssl ca-certificates
|
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
|
||||||
|
@@ -1 +0,0 @@
|
|||||||
1325134dd525b4a2c3272a1a0214dd54 Python-3.6.4.tar.xz
|
|
1
docker/2_buildpy/Python-3.6.6.tar.xz.md5
Normal file
1
docker/2_buildpy/Python-3.6.6.tar.xz.md5
Normal file
@@ -0,0 +1 @@
|
|||||||
|
c3f30a0aff425dda77d19e02f420d6ba Python-3.6.6.tar.xz
|
@@ -1,9 +1,9 @@
|
|||||||
FROM pillar_base
|
FROM pillar_base
|
||||||
LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
|
LABEL maintainer="Sybren A. Stüvel <sybren@blender.studio>"
|
||||||
|
|
||||||
RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list && \
|
RUN sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list && \
|
||||||
apt-get update && \
|
apt-get update && \
|
||||||
apt-get install -qy \
|
DEBIAN_FRONTEND=noninteractive apt-get install -qy \
|
||||||
build-essential \
|
build-essential \
|
||||||
apache2-dev \
|
apache2-dev \
|
||||||
checkinstall \
|
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
|
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
|
# Install Python sources
|
||||||
RUN curl -O https://www.python.org/ftp/python/3.6.4/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.4.tar.xz.md5 && \
|
md5sum -c Python-3.6.6.tar.xz.md5 && \
|
||||||
tar xf Python-3.6.4.tar.xz && \
|
tar xf Python-3.6.6.tar.xz && \
|
||||||
rm -v Python-3.6.4.tar.xz
|
rm -v Python-3.6.6.tar.xz
|
||||||
|
|
||||||
# Install mod-wsgi sources
|
# Install mod-wsgi sources
|
||||||
RUN mkdir -p /dpkg && cd /dpkg && apt-get source libapache2-mod-wsgi-py3
|
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
|
RUN ldconfig
|
||||||
ENV PATH=/opt/python/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
|
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
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
FROM pillar_base
|
FROM pillar_base
|
||||||
LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
|
LABEL maintainer="Sybren A. Stüvel <sybren@blender.studio>"
|
||||||
|
|
||||||
ADD python /opt/python
|
ADD python /opt/python
|
||||||
|
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
FROM armadillica/pillar_py:3.6
|
FROM armadillica/pillar_py:3.6
|
||||||
LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
|
LABEL maintainer="Sybren A. Stüvel <sybren@blender.studio>"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -qy \
|
RUN set -ex; \
|
||||||
|
apt-get update; \
|
||||||
|
DEBIAN_FRONTEND=noninteractive apt-get install -qy \
|
||||||
git \
|
git \
|
||||||
build-essential \
|
build-essential \
|
||||||
checkinstall \
|
checkinstall \
|
||||||
|
@@ -1,7 +1,9 @@
|
|||||||
FROM armadillica/pillar_py:3.6
|
FROM armadillica/pillar_py:3.6
|
||||||
LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
|
LABEL maintainer="Sybren A. Stüvel <sybren@blender.studio>"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -qyy \
|
RUN set -ex; \
|
||||||
|
apt-get update; \
|
||||||
|
DEBIAN_FRONTEND=noninteractive apt-get install -qy \
|
||||||
-o APT::Install-Recommends=false -o APT::Install-Suggests=false \
|
-o APT::Install-Recommends=false -o APT::Install-Suggests=false \
|
||||||
git \
|
git \
|
||||||
apache2 \
|
apache2 \
|
||||||
@@ -10,8 +12,8 @@ libjpeg8 \
|
|||||||
libtiff5 \
|
libtiff5 \
|
||||||
ffmpeg \
|
ffmpeg \
|
||||||
rsyslog logrotate \
|
rsyslog logrotate \
|
||||||
nano vim-tiny curl \
|
nano vim-tiny curl; \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN ln -s /usr/bin/vim.tiny /usr/bin/vim
|
RUN ln -s /usr/bin/vim.tiny /usr/bin/vim
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user