Merge branch 'aleksis-2.0rc2' into 'release/2.0'

Prepare release 2.0rc2

See merge request !677

CHANGELOG.rst

@@ -6,11 +6,21 @@ All notable changes to this project will be documented in this file.
 The format is based on `Keep a Changelog`_,
 and this project adheres to `Semantic Versioning`_.
 
-`2.0rc1` - 2021-06-23
+
+`2.0rc2`_ - 2021-06-24
+---------------------
+
+Added
+~~~~~
+
+* Allow to install system and build dependencies in docker build
+
+
+`2.0rc1`_ - 2021-06-23
 ----------------------
 
 Added
-~~~~~~~
+~~~~~
 
 * Add option to disable dashboard auto updating as a user and sitewide.
 
@@ -25,7 +35,7 @@ Fixed
 * Add missing AWS options to ignore invalid ssl certificates
 * Add missing dependency python-gnupg
 
-`2.0b2` - 2021-06-15
+`2.0b2`_ - 2021-06-15
 --------------------
 
 Changed
@@ -273,3 +283,4 @@ Fixed
 .. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b1
 .. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0b2
 .. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0rc1
+.. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS/-/tags/2.0rc2

Dockerfile

@@ -95,7 +95,18 @@ USER 33:33
 
 # Additional steps
 ONBUILD ARG APPS
+ONBUILD ARG BUILD_DEPS
+ONBUILD ARG SYSTEM_DEPS
 ONBUILD USER 0:0
+ONBUILD RUN set -e; \
+            if [ -n "$BUILD_DEPS" ]; then \
+                eatmydata apt-get update; \
+                eatmydata apt-get install -y $BUILD_DEPS; \
+            fi; \
+            if [ -n "$SYSTEM_DEPS" ]; then \
+                eatmydata apt-get update; \
+                eatmydata apt-get install -y $SYSTEM_DEPS; \
+            fi;
 ONBUILD RUN set -e; \
             if [ -n "$APPS" ]; then \
                 eatmydata pip install $APPS; \
@@ -103,7 +114,7 @@ ONBUILD RUN set -e; \
             eatmydata aleksis-admin yarn install; \
             eatmydata aleksis-admin collectstatic --no-input; \
             rm -rf /usr/local/share/.cache; \
-            eatmydata apt-get remove --purge -y yarnpkg; \
+            eatmydata apt-get remove --purge -y yarnpkg $BUILD_DEPS; \
             eatmydata apt-get autoremove --purge -y; \
             apt-get clean -y; \
             rm -f /var/lib/apt/lists/*_*; \