From 13b18010a78fe1f0f0f1ac3b53e85fc730519646 Mon Sep 17 00:00:00 2001
From: ThePhosphorus <adem.aber-aouni@polymtl.ca>
Date: Sun, 20 Nov 2022 11:55:34 -0500
Subject: [PATCH] Added required changes
---
Dockerfile | 11 ++++++++---
README.md | 7 ++++---
entrypoint.sh | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index eca7376..634bfbf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,13 @@
FROM debian:bullseye-slim
-LABEL MAINTAINER="Mathieu Ruellan <mathieu.ruellan@gmail.com>"
+LABEL MAINTAINER="STEP <contact@step.polymtl.ca>"
ENV DEBIAN_FRONTEND noninteractive
ENV HOME /root
-ARG PIWIGO_VERSION="12.2.0"
+ARG PIWIGO_VERSION="13.2.0"
+ARG PIWIGO_USER="www-data"
+ARG PIWIGO_GROUP="www-data"
RUN apt update -y \
&& apt install -yy \
@@ -37,12 +39,15 @@ RUN wget -q -O piwigo.zip http://piwigo.org/download/dlcounter.php?code=$PIWIGO_
mv /var/www/plugins /template/ && \
mv /var/www/local /template/ && \
mkdir -p /var/www/_data/i /config && \
- chown -R www-data:www-data /var/www &&\
+ chown -R $PIWIGO_USER:$PIWIGO_GROUP /var/www &&\
sed -i "s/max_execution_time = 30/max_execution_time = 300/" /etc/php/7.4/apache2/php.ini &&\
sed -i "s/memory_limit = 128M/memory_limit = 512M/" /etc/php/7.4/apache2/php.ini &&\
sed -i "s/max_input_time = 60/max_input_time = 180/" /etc/php/7.4/apache2/php.ini &&\
sed -i "s/post_max_size = 8M/post_max_size = 100M/" /etc/php/7.4/apache2/php.ini &&\
sed -i "s/upload_max_filesize = 2M/upload_max_filesize = 100M/" /etc/php/7.4/apache2/php.ini
+ sed -i "s/APACHE_RUN_USER=www-data/APACHE_RUN_USER=$PIWIGO_USER/" /etc/apache2/envvars
+ sed -i "s/APACHE_RUN_GROUP=www-data/APACHE_RUN_GROUP=$PIWIGO_GROUP/" /etc/apache2/envvars
+
VOLUME ["/var/www/galleries", "/var/www/themes", "/var/www/plugins", "/var/www/local", "/var/www/_data/i", "/config"]
diff --git a/README.md b/README.md
index b68efb4..2f3388a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
# Piwigo-Docker
+This is a fork of [mathieuruellan/piwigo](https://github.com/mathieuruellan/docker-piwigo).
This is an image for piwigo, linked with a mysql database.
Data must be stored on a volume.
@@ -39,7 +40,7 @@ piwigo:
domainname: MYDOMAIN.COM
```
+## STEP additions
-After db initialization (first launch), environment variables can me removed.
-
-.
+[x] Latest version of Piwigo
+[x] Personalised User permissions
diff --git a/entrypoint.sh b/entrypoint.sh
index 8f04c00..19d85a9 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -13,7 +13,7 @@ done;
sed -i "s/\/var\/www\/html/\/var\/www/g" /etc/apache2/sites-enabled/000-default.conf
sed -i '/^\s*DocumentRoot.*/a \\tSetEnv HTTPS on' /etc/apache2/sites-enabled/000-default.conf
-chown -R www-data:www-data /var/www
+# chown -R www-data:www-data /var/www
if [ ! -z "${PIWIGO_MYSQL_ENGINE}" ]; then
grep -Rn MyISAM /var/www/install | cut -d: -f1 | sort -u | while read file; do
--
GitLab