Fix for debian 12 issue (phpmyadmin#416) that caused libraries for ex…

…tensions to be uninstalled
ederuiter · Jun 29, 2023 · 37b7cff · 37b7cff
1 parent adf9118
commit 37b7cff
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Update to PHP 8.2 (#411)
 - Add back a `/sessions` volume for sessions persistence (#399)
 - Support adding custom configurations in `/etc/phpmyadmin/conf.d` (#401)
+- Fix for debian 12 issue (#416) that caused libraries for extensions to be uninstalled
 
 ## [5.2.1] - 2023-02-08
 

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -27,16 +27,19 @@ RUN set -ex; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+    extdir="$(php -r 'echo ini_get("extension_dir");')"; \
+    ldd "$extdir"/*.so \
         | awk '/=>/ { print $3 }' \
+        | awk '{print $1} {system("realpath " $1)}' \
         | 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/*
+    rm -rf /var/lib/apt/lists/*; \
+    ldd "$extdir"/*.so | grep -qzv "=> not found";
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php

diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -27,7 +27,8 @@ RUN set -ex; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+    extdir="$(php -r 'echo ini_get("extension_dir");')"; \
+    ldd "$extdir"/*.so \
         | awk '/=>/ { print $3 }' \
         | sort -u \
         | xargs -r dpkg-query -S \
@@ -36,7 +37,8 @@ RUN set -ex; \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/*; \
+    ldd "$extdir"/*.so | grep -qzv "=> not found";
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -27,7 +27,8 @@ RUN set -ex; \
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
-    ldd "$(php -r 'echo ini_get("extension_dir");')"/*.so \
+    extdir="$(php -r 'echo ini_get("extension_dir");')"; \
+    ldd "$extdir"/*.so \
         | awk '/=>/ { print $3 }' \
         | sort -u \
         | xargs -r dpkg-query -S \
@@ -36,7 +37,8 @@ RUN set -ex; \
         | xargs -rt apt-mark manual; \
     \
     apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/*; \
+    ldd "$extdir"/*.so | grep -qzv "=> not found";
 
 # set recommended PHP.ini settings
 # see https://secure.php.net/manual/en/opcache.installation.php