Upgrading to LTS Version 3.26.2+210503

Update README
Add configuration to run apache containers as www-data user (#61 )
2025-12-06 16:39:11 +01:00 · 2021-05-11 08:22:14 +02:00 · 2021-05-11 08:21:17 +02:00 · 2021-05-09 11:35:41 +02:00 · 2021-05-05 12:40:28 +02:00 · 2021-05-05 12:39:26 +02:00
11 changed files with 49 additions and 16 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# force LF in entrypoint.sh
+entrypoint.sh text eol=lf
--- a/3.0/apache/Dockerfile
+++ b/3.0/apache/Dockerfile
@@ -1,7 +1,9 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.20+210330'
-ARG sha256_checksum='e3110b14fb61b6e0c5c7c1976d6b4a01b86ca391b249c5f268db9add07170fef'
+ARG version='3.26.2+210503'
+ARG sha256_checksum='f76f1983e9dbf432346679c5697189a64e41a795facffa392bb9c66ea0de5675'
+ARG USER=root
+ARG LISTEN_PORT=80

 # Install OS dependencies
 RUN set -ex; \
@@ -71,9 +73,10 @@ RUN set -ex; \
        \
        tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
        rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R www-data:www-data /var/www/html
+        chown -R www-data:www-data /var/www/html /etc/apache2

 WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
+USER $USER
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]
--- a/3.0/apache/entrypoint.sh
+++ b/3.0/apache/entrypoint.sh
@@ -23,6 +23,8 @@ URL_FORMAT=${URL_FORMAT:-'path'}
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}

+LISTEN_PORT=${LISTEN_PORT:-"80"}
+
 if [ -z "$DB_PASSWORD" ]; then
    echo >&2 'Error: Missing DB_PASSWORD'
    exit 1
@@ -33,6 +35,11 @@ if [ -z "$ADMIN_PASSWORD" ]; then
    exit 1
 fi

+if [ "$LISTEN_PORT" != "80" ]; then
+    echo "Info: Customizing Apache Listen port to $LISTEN_PORT"
+    sed -i "s/80/$LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
+fi
+
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
    until nc -z -v -w30 $DB_HOST $DB_PORT
--- a/3.0/fpm-alpine/Dockerfile
+++ b/3.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.20+210330'
-ARG sha256_checksum='e3110b14fb61b6e0c5c7c1976d6b4a01b86ca391b249c5f268db9add07170fef'
+ARG version='3.26.2+210503'
+ARG sha256_checksum='f76f1983e9dbf432346679c5697189a64e41a795facffa392bb9c66ea0de5675'

 # Install OS dependencies
 RUN set -ex; \
--- a/3.0/fpm/Dockerfile
+++ b/3.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.25.20+210330'
-ARG sha256_checksum='e3110b14fb61b6e0c5c7c1976d6b4a01b86ca391b249c5f268db9add07170fef'
+ARG version='3.26.2+210503'
+ARG sha256_checksum='f76f1983e9dbf432346679c5697189a64e41a795facffa392bb9c66ea0de5675'

 # Install OS dependencies
 RUN set -ex; \
--- a/4.0/apache/Dockerfile
+++ b/4.0/apache/Dockerfile
@@ -1,7 +1,9 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.14+210322'
-ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'
+ARG version='4.5.2+210426'
+ARG sha256_checksum='001c3e416e319d1b64e502620fa2a9a32e69d9b4db2f6376f4a6293b43a063ea'
+ARG USER=root
+ARG LISTEN_PORT=80

 # Install OS dependencies
 RUN set -ex; \
@@ -72,9 +74,10 @@ RUN set -ex; \
        \
        tar xzvf "/tmp/limesurvey.tar.gz" --strip-components=1 -C /var/www/html/ && \
        rm -f "/tmp/limesurvey.tar.gz" && \
-        chown -R www-data:www-data /var/www/html
+        chown -R www-data:www-data /var/www/html /etc/apache2

 WORKDIR /var/www/html
 COPY entrypoint.sh entrypoint.sh
+USER $USER
 ENTRYPOINT ["/var/www/html/entrypoint.sh"]
 CMD ["apache2-foreground"]
--- a/4.0/apache/entrypoint.sh
+++ b/4.0/apache/entrypoint.sh
@@ -27,6 +27,8 @@ URL_FORMAT=${URL_FORMAT:-'path'}
 DEBUG=${DEBUG:-0}
 DEBUG_SQL=${DEBUG_SQL:-0}

+LISTEN_PORT=${LISTEN_PORT:-"80"}
+
 if [ -z "$DB_PASSWORD" ]; then
    echo >&2 'Error: Missing DB_PASSWORD'
    exit 1
@@ -37,6 +39,11 @@ if [ -z "$ADMIN_PASSWORD" ]; then
    exit 1
 fi

+if [ "$LISTEN_PORT" != "80" ]; then
+    echo "Info: Customizing Apache Listen port to $LISTEN_PORT"
+    sed -i "s/80/$LISTEN_PORT/" /etc/apache2/ports.conf /etc/apache2/sites-available/000-default.conf
+fi
+
 # Check if database is available
 if [ -z "$DB_SOCK" ]; then
    until nc -z -v -w30 $DB_HOST $DB_PORT
--- a/4.0/fpm-alpine/Dockerfile
+++ b/4.0/fpm-alpine/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.14+210322'
-ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'
+ARG version='4.5.2+210426'
+ARG sha256_checksum='001c3e416e319d1b64e502620fa2a9a32e69d9b4db2f6376f4a6293b43a063ea'

 # Install OS dependencies
 RUN set -ex; \
--- a/4.0/fpm/Dockerfile
+++ b/4.0/fpm/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='4.4.14+210322'
-ARG sha256_checksum='8dcfda29ee422499df2f63c443faaceaffc0f29727f9240565533c4068414e0c'
+ARG version='4.5.2+210426'
+ARG sha256_checksum='001c3e416e319d1b64e502620fa2a9a32e69d9b4db2f6376f4a6293b43a063ea'

 # Install OS dependencies
 RUN set -ex; \
--- a/README.md
+++ b/README.md
@@ -13,15 +13,19 @@ Dockerfile to build a [LimeSurvey](https://limesurvey.org) Image for the Docker
 ## Supported tags and respective Dockerfile links

 - [`4-apache`, `4.<BUILD-NUMBER>-apache`, `latest` ](https://github.com/martialblog/docker-limesurvey/blob/master/4.0/apache/Dockerfile)
+- [`4-apache-rootless`, `4.<BUILD-NUMBER>-apache-rootless`](https://github.com/martialblog/docker-limesurvey/blob/master/4.0/apache/Dockerfile)
 - [`4-fpm`, `4.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/4.0/fpm/Dockerfile)
 - [`4-fpm-alpine`, `4.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/4.0/fpm-alpine/Dockerfile)
 - [`3-apache`, `3.<BUILD-NUMBER>-apache`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/apache/Dockerfile)
+- [`3-apache-rootless`, `3.<BUILD-NUMBER>-apache-rootless`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/apache/Dockerfile)
 - [`3-fpm`, `3.<BUILD-NUMBER>-fpm`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/fpm/Dockerfile)
 - [`3-fpm-alpine`, `3.<BUILD-NUMBER>-fpm-alpine`](https://github.com/martialblog/docker-limesurvey/blob/master/3.0/fpm-alpine/Dockerfile)

 # Using the Apache Image

-The apache image comes with an Apache Webserver and PHP installed.
+The `apache` image comes with an Apache Webserver and PHP installed.
+
+This image is also available as `rootless` with `www-data` as default user.

 ## Apache Configuration

@@ -31,6 +35,8 @@ To change to Apache Webserver configuration, mount a Volume into the Container a

 See the example configuration provided.

+If you want to run Apache on a non-privileged port inside the container, just specify a environment variable `LISTEN_PORT` (e.g. `LISTEN_PORT=8080`).
+
 # Using the fpm Image

 To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. See *docker-compose.fpm.yml* for example.
@@ -112,6 +118,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 | ENCRYPT_KEYPAIR  | Data encryption keypair                  |
 | ENCRYPT_PUBLIC_KEY | Data encryption public key             |
 | ENCRYPT_SECRET_KEY | Data encryption secret key             |
+| LISTEN_PORT     | Apache: Listen port. Default: 80          |

 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings

--- a/6
+++ b/6
@@ -2,8 +2,12 @@

 apache3:
 	docker build --pull -t martialblog/limesurvey:3-apache 3.0/apache
+apache3-rootless:
+	docker build --pull --build-arg USER=www-data --build-arg LISTEN_PORT=8080 -t martialblog/limesurvey:3-apache-rootless 3.0/apache
 apache4:
-	docker build --pull -t martialblog/limesurvey:4-apache 4.0/apache
+	docker build --pull -t martialblog/limesurvey:3-apache 3.0/apache
+apache4-rootless:
+	docker build --pull --build-arg USER=www-data --build-arg LISTEN_PORT=8080 -t martialblog/limesurvey:4-apache-rootless 4.0/apache
 fpm-alpine3:
 	docker build --pull -t martialblog/limesurvey:3-fpm-alpine 3.0/fpm-alpine
 fpm-alpine4:
Author	SHA1	Message	Date
Markus Opolka	456a2ab4d2	Upgrading to LTS Version 3.26.2+210503	2021-05-11 08:22:14 +02:00
Markus Opolka	fd744e5c46	Update README	2021-05-11 08:21:17 +02:00
Markus Opolka	f1b7efb2d5	Add configuration to run apache containers as www-data user (#61 ) - in preparation for changing the default to www-data, which will happen at some time in the future	2021-05-09 11:35:41 +02:00
Markus Opolka	74b3f31ee4	Upgrading to Version 4.5.2+210426	2021-05-05 12:40:28 +02:00
Markus Opolka	fc6f655cf7	Upgrading to LTS Version 3.26.1+210427	2021-05-05 12:39:26 +02:00
Michael Prankl	01f6b41082	Customize Apache listen port (#59 ) * Overwrite apache listen port in Apache configuration if configured via environment variable LISTEN_PORT * Add documenation to README * Add default value to ENV vars documentation Co-authored-by: Michael Prankl <michael.prankl@muenchen.de>	2021-05-01 13:12:43 +02:00
Markus Opolka	c8d36cf425	Upgrading to Version 4.5.1+210420	2021-04-26 19:02:41 +02:00
Markus Opolka	0f7900e237	Upgrading to LTS Version 3.26.0+210419	2021-04-26 19:01:38 +02:00
Markus Opolka	a782896897	Upgrading to Version 4.5.0+210412	2021-04-19 17:53:54 +02:00
Markus Opolka	ce70ec3000	Upgrading to LTS Version 3.25.22+210413	2021-04-19 17:51:31 +02:00
Markus Opolka	0403aa1208	Upgrading to Version 4.4.16+210406	2021-04-12 17:02:11 +02:00
Markus Opolka	5a011e6818	Upgrading to LTS Version 3.25.21+210407	2021-04-12 17:01:30 +02:00
Markus Opolka	bb23531c6d	Upgrading to Version 4.4.15+210329	2021-04-07 17:34:02 +02:00