starred/docker
1
0
Fork 0
mirror of https://github.com/phpmyadmin/docker.git synced 2026-08-24 10:13:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added extra sanity check + better output in case of failure

Browse Source
This commit is contained in:
Eric de Ruiter
2023-06-29 18:34:21 +02:00
parent 37b7cff908
commit ab6a09ad9f
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile-debian.template
+2 -1
View File
@@ -39,7 +39,8 @@ RUN set -ex; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*; \
ldd "$extdir"/*.so | grep -qzv "=> not found";
ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
ldd "$extdir"/*.so | grep -q "libzip.so.* => .*/libzip.so.*" || (echo "Sanity check failed: libzip.so is not referenced"; ldd "$extdir"/*.so; exit 1);
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
apache/Dockerfile
+3 -1
View File
@@ -30,6 +30,7 @@ RUN set -ex; \
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 \
@@ -38,7 +39,8 @@ RUN set -ex; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*; \
ldd "$extdir"/*.so | grep -qzv "=> not found";
ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
ldd "$extdir"/*.so | grep -q "libzip.so.* => .*/libzip.so.*" || (echo "Sanity check failed: libzip.so is not referenced"; ldd "$extdir"/*.so; exit 1);
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php
fpm/Dockerfile
+3 -1
View File
@@ -30,6 +30,7 @@ RUN set -ex; \
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 \
@@ -38,7 +39,8 @@ RUN set -ex; \
\
apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
rm -rf /var/lib/apt/lists/*; \
ldd "$extdir"/*.so | grep -qzv "=> not found";
ldd "$extdir"/*.so | grep -qzv "=> not found" || (echo "Sanity check failed: missing libraries:"; ldd "$extdir"/*.so | grep " => not found"; exit 1); \
ldd "$extdir"/*.so | grep -q "libzip.so.* => .*/libzip.so.*" || (echo "Sanity check failed: libzip.so is not referenced"; ldd "$extdir"/*.so; exit 1);
# set recommended PHP.ini settings
# see https://secure.php.net/manual/en/opcache.installation.php