From 4ffb8acf4758c0d46acf1cdb9b5ad7723d681b43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Tue, 17 Sep 2024 14:00:54 +0200 Subject: [PATCH] All: upgrade alpine to 3.20, debian to bookworm, PHP to 8.3 --- adminer-dg/Dockerfile | 42 ++++++++++++++++++++---------------- adminer-editor/Dockerfile | 34 ++++++++++++++++------------- adminer-full/Dockerfile | 32 +++++++++++++++------------ adminer-mongo/Dockerfile | 28 +++++++++++++----------- adminer-mysql/Dockerfile | 28 +++++++++++++----------- adminer-oracle-11/Dockerfile | 27 +++++++++++++---------- adminer-oracle-12/Dockerfile | 27 +++++++++++++---------- adminer-postgres/Dockerfile | 28 +++++++++++++----------- 8 files changed, 140 insertions(+), 106 deletions(-) diff --git a/adminer-dg/Dockerfile b/adminer-dg/Dockerfile index 9ad19e6..94168c1 100644 --- a/adminer-dg/Dockerfile +++ b/adminer-dg/Dockerfile @@ -1,30 +1,29 @@ -FROM alpine:3.14 +FROM alpine:3.20 LABEL maintainer="Milan Sulc " -ENV ADMINER_DG_VERION=1.28.1 +ENV ADMINER_DG_VERION=2.0.0 ENV MEMORY=256M ENV UPLOAD=2048M ENV WORKERS=4 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \ +RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ - wget \ - ca-certificates \ - php8@community \ - php8-session@community \ - php8-mysqli@community \ - php8-pgsql@community \ - php8-json@community \ - php8-pecl-mongodb@community \ - tini && \ + wget \ + ca-certificates \ + php83@community \ + php83-session@community \ + php83-mysqli@community \ + php83-pgsql@community \ + php83-json@community \ + php83-pecl-mongodb@community \ + tini && \ wget https://github.com/dg/adminer-custom/archive/v$ADMINER_DG_VERION.tar.gz -O /srv/adminer.tgz && \ tar zxvf /srv/adminer.tgz --strip-components=1 -C /srv && \ rm /srv/adminer.tgz && \ - ln -s /usr/bin/php8 /usr/bin/php && \ apk del wget ca-certificates && \ rm -rf /var/cache/apk/* @@ -32,9 +31,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ] diff --git a/adminer-editor/Dockerfile b/adminer-editor/Dockerfile index 9129503..da761da 100644 --- a/adminer-editor/Dockerfile +++ b/adminer-editor/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.20 LABEL maintainer="Milan Sulc " @@ -8,21 +8,20 @@ ENV UPLOAD=2048M ENV WORKERS=4 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \ +RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ wget \ ca-certificates \ - php8@community \ - php8-session@community \ - php8-mysqli@community \ - php8-pgsql@community \ - php8-json@community \ - php8-pecl-mongodb@community \ + php83-session@community \ + php83-mysqli@community \ + php83-pgsql@community \ + php83-json@community \ + php83-pecl-mongodb@community \ tini && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_EDITOR_VERSION/editor-$ADMINER_EDITOR_VERSION.php -O /srv/index.php && \ - ln -s /usr/bin/php8 /usr/bin/php && \ + ln -s /usr/bin/php83 /usr/bin/php && \ apk del wget ca-certificates && \ rm -rf /var/cache/apk/* @@ -30,9 +29,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ] diff --git a/adminer-full/Dockerfile b/adminer-full/Dockerfile index 40b478a..fe2af88 100644 --- a/adminer-full/Dockerfile +++ b/adminer-full/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.20 LABEL maintainer="Milan Sulc " @@ -8,18 +8,17 @@ ENV UPLOAD=2048M ENV WORKERS=4 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \ +RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ wget \ ca-certificates \ - php8@community \ - php8-session@community \ - php8-mysqli@community \ - php8-pgsql@community \ - php8-json@community \ - php8-pecl-mongodb@community \ + php83-session@community \ + php83-mysqli@community \ + php83-pgsql@community \ + php83-json@community \ + php83-pecl-mongodb@community \ tini && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \ ln -s /usr/bin/php8 /usr/bin/php && \ @@ -30,9 +29,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ] diff --git a/adminer-mongo/Dockerfile b/adminer-mongo/Dockerfile index 451aad8..134e8b1 100644 --- a/adminer-mongo/Dockerfile +++ b/adminer-mongo/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.20 LABEL maintainer="Milan Sulc " @@ -8,18 +8,17 @@ ENV UPLOAD=2048M ENV WORKERS=4 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \ +RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ wget \ ca-certificates \ - php8@community \ - php8-session@community \ - php8-pecl-mongodb@community \ + php83-session@community \ + php83-pecl-mongodb@community \ tini && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \ - ln -s /usr/bin/php8 /usr/bin/php && \ + ln -s /usr/bin/php83 /usr/bin/php && \ apk del wget ca-certificates && \ rm -rf /var/cache/apk/* @@ -27,9 +26,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ] diff --git a/adminer-mysql/Dockerfile b/adminer-mysql/Dockerfile index 76e1913..a71ca76 100644 --- a/adminer-mysql/Dockerfile +++ b/adminer-mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.20 LABEL maintainer="Milan Sulc " @@ -8,18 +8,17 @@ ENV UPLOAD=2048M ENV WORKERS=4 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \ +RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ wget \ ca-certificates \ - php8@community \ - php8-session@community \ - php8-mysqli@community \ + php83-session@community \ + php83-mysqli@community \ tini && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \ - ln -s /usr/bin/php8 /usr/bin/php && \ + ln -s /usr/bin/php83 /usr/bin/php && \ apk del wget ca-certificates && \ rm -rf /var/cache/apk/* @@ -27,9 +26,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ] diff --git a/adminer-oracle-11/Dockerfile b/adminer-oracle-11/Dockerfile index c798dd6..b018326 100644 --- a/adminer-oracle-11/Dockerfile +++ b/adminer-oracle-11/Dockerfile @@ -1,4 +1,4 @@ -FROM dockette/debian:buster +FROM dockette/debian:bullseye LABEL maintainer="Milan Sulc " @@ -23,9 +23,9 @@ RUN apt-get update && \ unzip \ libaio1 \ ca-certificates \ - php8.0 \ - php8.0-dev \ - php8.0-xml \ + php8.3 \ + php8.3-dev \ + php8.3-xml \ php-pear \ tini && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php @@ -38,7 +38,7 @@ RUN wget https://github.com/f00b4r/oracle-instantclient/raw/master/instantclient ln -s /usr/local/instantclient_11_2 /usr/local/instantclient && \ ln -s /usr/local/instantclient/libclntsh.so.11.1 /usr/local/instantclient/libclntsh.so && \ echo 'instantclient,/usr/local/instantclient' | pecl install oci8 && \ - echo "extension=oci8.so" > /etc/php/8.0/cli/conf.d/00-oci8.ini + echo "extension=oci8.so" > /etc/php/8.3/cli/conf.d/00-oci8.ini # CLEAN UP ##################################################################### RUN apt-get clean -y && \ @@ -51,9 +51,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ] diff --git a/adminer-oracle-12/Dockerfile b/adminer-oracle-12/Dockerfile index e2d61ff..92641f7 100644 --- a/adminer-oracle-12/Dockerfile +++ b/adminer-oracle-12/Dockerfile @@ -1,4 +1,4 @@ -FROM dockette/debian:buster +FROM dockette/debian:bullseye LABEL maintainer="Milan Sulc " @@ -23,9 +23,9 @@ RUN apt-get update && \ unzip \ libaio1 \ ca-certificates \ - php8.0 \ - php8.0-dev \ - php8.0-xml \ + php8.3 \ + php8.3-dev \ + php8.3-xml \ php-pear \ tini && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php @@ -38,7 +38,7 @@ RUN wget https://github.com/f00b4r/oracle-instantclient/raw/master/instantclient ln -s /usr/local/instantclient_12_1 /usr/local/instantclient && \ ln -s /usr/local/instantclient/libclntsh.so.12.1 /usr/local/instantclient/libclntsh.so && \ echo 'instantclient,/usr/local/instantclient' | pecl install oci8 && \ - echo "extension=oci8.so" > /etc/php/8.0/cli/conf.d/00-oci8.ini + echo "extension=oci8.so" > /etc/php/8.3/cli/conf.d/00-oci8.ini # CLEAN UP ##################################################################### RUN apt-get clean -y && \ @@ -51,9 +51,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ] diff --git a/adminer-postgres/Dockerfile b/adminer-postgres/Dockerfile index c5352ae..364a7b3 100644 --- a/adminer-postgres/Dockerfile +++ b/adminer-postgres/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.14 +FROM alpine:3.20 LABEL maintainer="Milan Sulc " @@ -8,18 +8,17 @@ ENV UPLOAD=2048M ENV WORKERS=4 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community http://nl.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \ +RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ wget \ ca-certificates \ - php8@community \ - php8-session@community \ - php8-pgsql@community \ + php83-session@community \ + php83-pgsql@community \ tini && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \ - ln -s /usr/bin/php8 /usr/bin/php && \ + ln -s /usr/bin/php83 /usr/bin/php && \ apk del wget ca-certificates && \ rm -rf /var/cache/apk/* @@ -27,9 +26,14 @@ WORKDIR /srv EXPOSE 80 ENTRYPOINT ["/sbin/tini", "--"] - -CMD /usr/bin/php \ - -d memory_limit=$MEMORY \ - -d upload_max_filesize=$UPLOAD \ - -d post_max_size=$UPLOAD \ - -S 0.0.0.0:80 +CMD [\ + "/usr/bin/php", \ + "-d", \ + "memory_limit=${MEMORY}", \ + "-d", \ + "upload_max_filesize=${UPLOAD}", \ + "-d", \ + "post_max_size=${UPLOAD}", \ + "-S", \ + "0.0.0.0:80" \ + ]