Upgrading to LTS Version 3.27.17+210911

This makes more clear for those who want to use the LTS version of limesurvey, that some adaptations are needed.

.github/workflows/test-latest-container-images.yaml

@@ -40,6 +40,8 @@ jobs:
           format: 'template'
           template: '@/contrib/sarif.tpl'
           exit-code: '0'
+          # Since we are not in charge of the Application
+          vuln-type: 'os'
           output: trivy-results-5-${{ matrix.context }}.sarif
           severity: 'CRITICAL,HIGH'
 

.github/workflows/test-lts-container-images.yaml

@@ -40,6 +40,8 @@ jobs:
           format: 'template'
           template: '@/contrib/sarif.tpl'
           exit-code: '0'
+          # Since we are not in charge of the Application
+          vuln-type: 'os'
           output: trivy-results-3-${{ matrix.context }}.sarif
           severity: 'CRITICAL,HIGH'
 

3.0/apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.7+210713'
+ARG version='3.27.17+210911'
-ARG sha256_checksum='cd88e6d0cbd4652b6814dd48b8ed493817666ecbf81b80806ee740fdc02dca28'
+ARG sha256_checksum='60a4920643e8cc0ac5e85dac45f7d6ce36eab471bd28917b1ca7d3f97419147c'
 ARG USER=root
 ARG LISTEN_PORT=80
 

3.0/fpm-alpine/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.7+210713'
+ARG version='3.27.17+210911'
-ARG sha256_checksum='cd88e6d0cbd4652b6814dd48b8ed493817666ecbf81b80806ee740fdc02dca28'
+ARG sha256_checksum='60a4920643e8cc0ac5e85dac45f7d6ce36eab471bd28917b1ca7d3f97419147c'
 
 # Install OS dependencies
 RUN set -ex; \

3.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:7.4-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='3.27.7+210713'
+ARG version='3.27.17+210911'
-ARG sha256_checksum='cd88e6d0cbd4652b6814dd48b8ed493817666ecbf81b80806ee740fdc02dca28'
+ARG sha256_checksum='60a4920643e8cc0ac5e85dac45f7d6ce36eab471bd28917b1ca7d3f97419147c'
 
 # Install OS dependencies
 RUN set -ex; \

5.0/apache/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8-apache
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.0.7+210628'
+ARG version='5.1.9+210912'
-ARG sha256_checksum='efde82aabe036263e2ab938315ede8b697f1aafeffedd1d48dc492af9bbddf42'
+ARG sha256_checksum='6e285ea67d555b6601a478c32e409b038ebc98637b3f647c87903c80ba85d1f4'
 ARG USER=www-data
 ARG LISTEN_PORT=8080
 

5.0/fpm-alpine/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8-fpm-alpine
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.0.7+210628'
+ARG version='5.1.9+210912'
-ARG sha256_checksum='efde82aabe036263e2ab938315ede8b697f1aafeffedd1d48dc492af9bbddf42'
+ARG sha256_checksum='6e285ea67d555b6601a478c32e409b038ebc98637b3f647c87903c80ba85d1f4'
 ARG USER=www-data
 
 # Install OS dependencies

5.0/fpm/Dockerfile

@@ -1,7 +1,7 @@
 FROM php:8-fpm
 LABEL maintainer="markus@martialblog.de"
-ARG version='5.0.7+210628'
+ARG version='5.1.9+210912'
-ARG sha256_checksum='efde82aabe036263e2ab938315ede8b697f1aafeffedd1d48dc492af9bbddf42'
+ARG sha256_checksum='6e285ea67d555b6601a478c32e409b038ebc98637b3f647c87903c80ba85d1f4'
 ARG USER=www-data
 
 # Install OS dependencies

README.md

@@ -124,7 +124,7 @@ For further details on the settings see: https://manual.limesurvey.org/Data_encr
 
 For further details on the settings see: https://manual.limesurvey.org/Optional_settings#Advanced_Path_Settings
 
-# Running this Image with docker-compose
+# Running LimeSurvey with docker-compose
 
 The easiest way to get a fully featured and functional setup is using a docker-compose file. Several examples are provided in the [repository](https://github.com/martialblog/docker-limesurvey).
 
@@ -138,6 +138,12 @@ http://localhost:8080/
 http://localhost:8080/index.php/admin
 ```
 
+# Running LimeSurvey with Helm
+
+A Helm Chart for this Image can be used for deployments. Please refer to the Helm Repository for further details:
+
+https://github.com/martialblog/helm-charts
+
 # Upgrade Guide
 
 These guides are only referring to the Docker Image, for details on the application users should consult the [official LimeSurvey documentation](https://manual.limesurvey.org/Upgrading_from_a_previous_version) for details.

docker-compose.pgsql.yml

@@ -2,6 +2,7 @@ version: "3.0"
 services:
   limesurvey:
     build:
+      # Hint: Change it to 3.0/apache/ if you want to use LimeSurvey 3.*
       context: 5.0/apache/
       dockerfile: Dockerfile
     volumes:
@@ -12,6 +13,7 @@ services:
     depends_on:
       - lime-db
     ports:
+      # Hint: Change it to 80:8080 if you are using LimeSurvey 3.*
       - "8080:8080"
     environment:
       - "DB_TYPE=pgsql"

nginx-certbot/entrypoint.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 cert_path=/etc/letsencrypt/live/$(echo "$HOSTNAMES" | awk '{print $1}')
-mkdir -p cert_path
+mkdir -p $cert_path
 
 # if there is no certificate yet, get one
 email="--email $CERT_EMAIL"
@@ -19,7 +19,7 @@ then
     echo "Getting new certificate..."
     /usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > /etc/letsencrypt/options-ssl-nginx.conf
     /usr/bin/curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > /etc/letsencrypt/ssl-dhparams.pem
-    /usr/bin/certbot certonly --standalone "$names" --agree-tos "$email"
+    /usr/bin/certbot certonly --standalone $names --agree-tos "$email"
 fi
 
 nginx -g "daemon off;"