From 25d157409cdffff788f49ca145a68f13d0b4acbe Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Thu, 24 Jun 2021 18:02:45 +0200
Subject: [PATCH] Allow to install system and build dependencies. Advances
AlekSIS#29
---
Dockerfile | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
index 39f7d87bb..4812dea41 100644
--- a/Dockerfile
+++ b/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/*_*; \
--
GitLab