From 0d5c0fbd4e66fef4ba69c6da493e113217c307cf Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 22 Mar 2021 20:51:41 +0100
Subject: [PATCH] [Docker] Honour storage locations and declare volumes
correctly
Advances #403
---
Dockerfile | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 1f756dfc9..c63dd79d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,12 +47,11 @@ RUN case ",$EXTRAS," in \
# Install core
RUN set -e; \
- mkdir -p /var/lib/aleksis/media /usr/share/aleksis/static /var/lib/aleksis/backups; \
+ mkdir -p ${ALEKSIS_static__root} \
+ ${ALEKSIS_media__root} \
+ ${ALEKSIS_backup__location}; \
eatmydata pip install AlekSIS-Core\[$EXTRAS\]$APP_VERSION
-# Declare a persistent volume for all data
-VOLUME /var/lib/aleksis
-
# Define entrypoint and uWSGI running on port 8000
EXPOSE 8000
COPY docker-startup.sh /usr/local/bin/aleksis-docker-startup
@@ -85,6 +84,12 @@ RUN set -e; \
FROM clean AS unprivileged
WORKDIR /var/lib/aleksis
RUN chown -R www-data:www-data \
- /var/lib/aleksis \
- /usr/share/aleksis/static
+ ${ALEKSIS_static__root} \
+ ${ALEKSIS_media__root} \
+ ${ALEKSIS_backup__location}
USER www-data:www-data
+
+# Declare persistent volumes for all data
+VOLUME ${ALEKSIS_static__root}
+VOLUME ${ALEKSIS_media__root}
+VOLUME ${ALEKSIS_backup__location}
--
GitLab