Merge pull request #181 from edgarrmondragon/edgarrmondragom/5.6.46+231121-and-6.3.6+231120

Upgrade to 5.6.46+231121 and 6.3.6+231120
2025-12-06 16:39:11 +01:00 · 2023-11-29 07:53:24 +01:00 · 2023-11-28 19:46:11 -06:00 · 2023-11-22 08:00:01 +01:00 · 2023-11-22 07:59:37 +01:00 · 2023-11-15 16:31:01 +01:00
6 changed files with 29 additions and 15 deletions
--- a/5.0/apache/Dockerfile
+++ b/5.0/apache/Dockerfile
@@ -81,8 +81,8 @@ RUN a2enmod headers rewrite remoteip; \
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

-ARG version="5.6.43+231030"
-ARG sha256_checksum="4eedef15202ac771e08cb64a4c8e4083026da6ac1642f9a1ba952f8917e321f0"
+ARG version="5.6.46+231121"
+ARG sha256_checksum="f80d5b5c9ae4a23f03b53ef27e29a12ae04525d735627f9e311cbbfbbe61b7ef"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ARG LISTEN_PORT=8080
--- a/5.0/fpm-alpine/Dockerfile
+++ b/5.0/fpm-alpine/Dockerfile
@@ -51,8 +51,8 @@ RUN set -ex; \
    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
    apk del --no-cache --no-network .build-deps

-ARG version="5.6.43+231030"
-ARG sha256_checksum="4eedef15202ac771e08cb64a4c8e4083026da6ac1642f9a1ba952f8917e321f0"
+ARG version="5.6.46+231121"
+ARG sha256_checksum="f80d5b5c9ae4a23f03b53ef27e29a12ae04525d735627f9e311cbbfbbe61b7ef"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
--- a/5.0/fpm/Dockerfile
+++ b/5.0/fpm/Dockerfile
@@ -68,8 +68,8 @@ RUN set -ex; \
        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
        rm -rf /var/lib/apt/lists/*

-ARG version="5.6.43+231030"
-ARG sha256_checksum="4eedef15202ac771e08cb64a4c8e4083026da6ac1642f9a1ba952f8917e321f0"
+ARG version="5.6.46+231121"
+ARG sha256_checksum="f80d5b5c9ae4a23f03b53ef27e29a12ae04525d735627f9e311cbbfbbe61b7ef"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
--- a/6.0/apache/Dockerfile
+++ b/6.0/apache/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/php:8.0-apache
+FROM docker.io/php:8.1-apache
 LABEL maintainer="markus@martialblog.de"

 # Install OS dependencies
@@ -64,6 +64,13 @@ RUN set -ex; \
                | cut -d: -f1 \
                | sort -u \
                | xargs -rt apt-mark manual; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '$3 ~ /^\/lib/ { print "/usr"$3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
        \
        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
        rm -rf /var/lib/apt/lists/*
@@ -81,8 +88,8 @@ RUN a2enmod headers rewrite remoteip; \
 # Use the default production configuration
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"

-ARG version="6.3.1+231023"
-ARG sha256_checksum="7a75e490d28c27b4eef9bcebda08edf927a48009769471da8a1b3dcc4099e9ca"
+ARG version="6.3.6+231120"
+ARG sha256_checksum="11c70b2992ab1da5be8575bd251945f1ab8ade86cc8e96079659e9a2a9d8c931"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ARG LISTEN_PORT=8080
--- a/6.0/fpm-alpine/Dockerfile
+++ b/6.0/fpm-alpine/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/php:8.0-fpm-alpine
+FROM docker.io/php:8.1-fpm-alpine
 LABEL maintainer="markus@martialblog.de"

 # Install OS dependencies
@@ -51,8 +51,8 @@ RUN set -ex; \
    apk add --no-cache --no-network --virtual .limesurvey-phpext-rundeps $runDeps; \
    apk del --no-cache --no-network .build-deps

-ARG version="6.3.1+231023"
-ARG sha256_checksum="7a75e490d28c27b4eef9bcebda08edf927a48009769471da8a1b3dcc4099e9ca"
+ARG version="6.3.6+231120"
+ARG sha256_checksum="11c70b2992ab1da5be8575bd251945f1ab8ade86cc8e96079659e9a2a9d8c931"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
--- a/6.0/fpm/Dockerfile
+++ b/6.0/fpm/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/php:8.0-fpm
+FROM docker.io/php:8.1-fpm
 LABEL maintainer="markus@martialblog.de"

 # Install OS dependencies
@@ -64,12 +64,19 @@ RUN set -ex; \
                | cut -d: -f1 \
                | sort -u \
                | xargs -rt apt-mark manual; \
+        ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+                | awk '$3 ~ /^\/lib/ { print "/usr"$3 }' \
+                | sort -u \
+                | xargs -r dpkg-query -S \
+                | cut -d: -f1 \
+                | sort -u \
+                | xargs -rt apt-mark manual; \
        \
        apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
        rm -rf /var/lib/apt/lists/*

-ARG version="6.3.1+231023"
-ARG sha256_checksum="7a75e490d28c27b4eef9bcebda08edf927a48009769471da8a1b3dcc4099e9ca"
+ARG version="6.3.6+231120"
+ARG sha256_checksum="11c70b2992ab1da5be8575bd251945f1ab8ade86cc8e96079659e9a2a9d8c931"
 ARG archive_url="https://github.com/LimeSurvey/LimeSurvey/archive/refs/tags/${version}.tar.gz"
 ARG USER=www-data
 ENV LIMESURVEY_VERSION=$version
Author	SHA1	Message	Date
Markus Opolka	7343b66cba	Merge pull request #181 from edgarrmondragon/edgarrmondragom/5.6.46+231121-and-6.3.6+231120 Upgrade to 5.6.46+231121 and 6.3.6+231120	2023-11-29 07:53:24 +01:00
Edgar Ramírez Mondragón	55c7a955bc	Upgrade to 5.6.46+231121 and 6.3.6+231120	2023-11-28 19:46:11 -06:00
Markus Opolka	02e8715589	Upgrading to Version 6.3.5+231113	2023-11-22 08:00:01 +01:00
Markus Opolka	b19d599e78	Upgrading to LTS Version 5.6.45+231114	2023-11-22 07:59:37 +01:00
Markus Opolka	98db5c64e9	Merge pull request #177 from edgarrmondragon/bump-php Bump PHP to 8.1 in 6.x images	2023-11-15 16:31:01 +01:00
Markus Opolka	cbc70e8d1f	Upgrading to Version 6.3.4+231108	2023-11-14 08:05:58 +01:00
Markus Opolka	fbd0af36a9	Upgrading to LTS Version 5.6.44+231107	2023-11-14 07:59:57 +01:00
Edgar Ramírez Mondragón	cf6a81b1f0	Use PHP 8.1	2023-11-10 10:07:03 -06:00
Markus Opolka	7f9fb7c962	Merge pull request #178 from martialblog/extend-apt-mark Improve removal of dev packages	2023-11-10 14:34:53 +01:00
Markus Opolka	8b727d954f	Improve removal of dev packages - Due to the PHP libs being at /lib in newer Image versions the apt-mark manual wouldn't catch them and remove important libraries. This extends the marking of required packages.	2023-11-10 14:28:49 +01:00
Markus Opolka	ef3fab259e	Upgrading to Version 6.3.3+231106	2023-11-07 07:38:47 +01:00