feat: Preparing next release

1. Shuffle a bit multistaged build
2. Ensure gcc & g++ still installed
3. Update README & CHANGELOG files

Author: playpauseandstop

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 4.2.0 (In Development)
+
+- Update `py39` image to Python 3.9.2
+- Update pip to 21.0.1
+- Update pre-commit to 20.10.1
+- Update tox to 3.22.0
+- Update virtualenv to 20.4.2
+
 # 4.1.0 (2021-01-05)
 
 - Update `py39` image to Python 3.9.1

Dockerfile

@@ -1,22 +1,33 @@
+# TODO: Find out whether it possible to use "faster" base Python image
 FROM python:3.9.2-slim-buster as python-base
 
 LABEL maintainer="Igor Davydenko <iam@igordavydenko.com>"
 LABEL description="Add poetry, pre-commit, and other dev-tools to official Python slim Docker image."
 
-# poetry envirnment
-ENV POETRY_HOME="/opt/poetry"
-ENV POETRY_NO_INTERACTION=1
+# Ensure to use latest system versions
+RUN apt update -qq && apt upgrade -y && apt autoremove -y
 
-# versions
-ENV POETRY_VERSION=1.1.4
-ENV PIP_VERSION 20.3.3
-ENV PRE_COMMIT_VERSION 2.9.3
-ENV TOX_VERSION 3.20.1
-ENV VIRTUALENV_VERSION 20.2.2
+# Global poetry setup
+ENV POETRY_HOME "/opt/poetry"
+ENV POETRY_NO_INTERACTION "1"
+ENV PATH "${POETRY_HOME}/bin:${PATH}"
 
-# additonal applications to install
+# Install poetry at one stage
+FROM python-base as poetry-base
+
+ENV POETRY_VERSION "1.1.4"
+RUN apt install -y build-essential curl
+RUN curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
+RUN poetry --version
+
+# Install dev tools at another stage
+FROM python-base as development-base
+
+# Additonal applications to install
 ENV ADDITIONAL_APPS \
     curl \
+    g++ \
+    gcc \
     gettext \
     git \
     locales \
@@ -25,31 +36,26 @@ ENV ADDITIONAL_APPS \
     nano \
     openssh-client \
     rsync
+RUN apt install -y ${ADDITIONAL_APPS} && apt autoremove -y
+
+# To check latest versions,
+#
+# ```bash
+# pip-latest-release pip pre-commit tox virtualenv
+# ```
+ENV PIP_VERSION "21.0.1"
+ENV PRE_COMMIT_VERSION "2.10.1"
+ENV TOX_VERSION "3.22.0"
+ENV VIRTUALENV_VERSION "20.4.2"
 
-# prepend poetry
-ENV PATH="$POETRY_HOME/bin:$PATH"
-
-RUN apt update -qq \
-    && apt upgrade -y \
-    && apt autoremove -y
-
-FROM python-base as poetry-builder-base
-RUN apt install -y \
-    curl \
-    build-essential
-RUN curl -sSL https://raw.githubusercontent.com/sdispater/poetry/master/get-poetry.py | python
-RUN poetry --version
-
-
-FROM python-base as development-base
-RUN apt install -y $ADDITIONAL_APPS && apt autoremove -y
 RUN pip install \
-    pip==$PIP_VERSION \
-    pre-commit==$PRE_COMMIT_VERSION \
-    tox==$TOX_VERSION \
-    virtualenv==$VIRTUALENV_VERSION
+    pip==${PIP_VERSION} \
+    pre-commit==${PRE_COMMIT_VERSION} \
+    tox==${TOX_VERSION} \
+    virtualenv==${VIRTUALENV_VERSION}
 
-COPY --from=poetry-builder-base $POETRY_HOME $POETRY_HOME
+# Copy poetry from previous stage
+COPY --from=poetry-base ${POETRY_HOME} ${POETRY_HOME}
 
 WORKDIR /app
 CMD ["python3"]

README.md

@@ -9,21 +9,21 @@ image.
 ## Usage
 
 ```dockerfile
-FROM playpauseandstop/docker-python:4.0.0
+FROM playpauseandstop/docker-python:4.1.0
 ```
 
 ### Included dev-tools
 
-- [pip](https://pip.pypa.io) 20.3.3
+- [pip](https://pip.pypa.io) 21.0.1
 - [poetry](https://python-poetry.org) 1.1.4
-- [pre-commit](https://pre-commit.com) 2.9.3
-- [tox](https://tox.readthedocs.io/) 3.20.1
-- [virtualenv](https://virtualenv.pypa.io) 20.2.2
+- [pre-commit](https://pre-commit.com) 2.10.1
+- [tox](https://tox.readthedocs.io/) 3.22.0
+- [virtualenv](https://virtualenv.pypa.io) 20.4.2
 - [curl](https://curl.haxx.se) 7.64.0
+- [gcc & g++](https://gcc.gnu.org) 8.3.0
 - [git](https://git-scm.com) 2.20.1
 - [locales](https://packages.debian.org/stretch/locales) &
   [locales-all](https://packages.debian.org/stretch/locales-all)
-- [gcc & g++](https://gcc.gnu.org) 8.3.0
 - [make](https://www.gnu.org/software/make) 4.2.1
 - [nano](https://www.nano-editor.org) 3.2
 - [gettext](https://www.gnu.org/software/gettext) 0.19.8.1