From 65c7e27a5ed13883898bd9a8f944026f9a0c36b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Sun, 27 Sep 2026 16:23:09 +0000 Subject: [PATCH 1/2] Docker: bump Adminer to 6.1.1 and Alpine to 3.24 Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VSKw7jY45nUJWQxWpvjm82 --- adminer-dg/Dockerfile | 4 ++-- adminer-editor/Dockerfile | 6 +++--- adminer-full/Dockerfile | 6 +++--- adminer-mongo/Dockerfile | 6 +++--- adminer-mssql/Dockerfile | 2 +- adminer-mysql/Dockerfile | 6 +++--- adminer-oracle-11/Dockerfile | 2 +- adminer-oracle-12/Dockerfile | 2 +- adminer-oracle-19/Dockerfile | 2 +- adminer-postgres/Dockerfile | 6 +++--- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/adminer-dg/Dockerfile b/adminer-dg/Dockerfile index 566937a..a2d75dc 100644 --- a/adminer-dg/Dockerfile +++ b/adminer-dg/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.23 +FROM alpine:3.24 LABEL maintainer="Milan Sulc " @@ -9,7 +9,7 @@ ENV PORT=80 ENV WORKERS=8 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.23/community' >> /etc/apk/repositories && \ +RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ diff --git a/adminer-editor/Dockerfile b/adminer-editor/Dockerfile index 82a7195..39c1e3f 100644 --- a/adminer-editor/Dockerfile +++ b/adminer-editor/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.23 +FROM alpine:3.24 LABEL maintainer="Milan Sulc " -ENV ADMINER_EDITOR_VERSION=6.1.0 +ENV ADMINER_EDITOR_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 ENV WORKERS=8 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.23/community' >> /etc/apk/repositories && \ +RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ diff --git a/adminer-full/Dockerfile b/adminer-full/Dockerfile index 2b06858..155bdf6 100644 --- a/adminer-full/Dockerfile +++ b/adminer-full/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.23 +FROM alpine:3.24 LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 ENV WORKERS=8 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.23/community' >> /etc/apk/repositories && \ +RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ diff --git a/adminer-mongo/Dockerfile b/adminer-mongo/Dockerfile index fbe2a92..55d9ba2 100644 --- a/adminer-mongo/Dockerfile +++ b/adminer-mongo/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.23 +FROM alpine:3.24 LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 ENV WORKERS=8 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.23/community' >> /etc/apk/repositories && \ +RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ diff --git a/adminer-mssql/Dockerfile b/adminer-mssql/Dockerfile index a74096d..1456656 100644 --- a/adminer-mssql/Dockerfile +++ b/adminer-mssql/Dockerfile @@ -2,7 +2,7 @@ FROM dockette/debian:bookworm-slim LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 diff --git a/adminer-mysql/Dockerfile b/adminer-mysql/Dockerfile index 5ad2c21..248e6fb 100644 --- a/adminer-mysql/Dockerfile +++ b/adminer-mysql/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.22 +FROM alpine:3.24 LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 ENV WORKERS=8 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community http://nl.alpinelinux.org/alpine/v3.22/community' >> /etc/apk/repositories && \ +RUN echo '@community http://nl.alpinelinux.org/alpine/v3.24/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ diff --git a/adminer-oracle-11/Dockerfile b/adminer-oracle-11/Dockerfile index 6048860..d6db78f 100644 --- a/adminer-oracle-11/Dockerfile +++ b/adminer-oracle-11/Dockerfile @@ -2,7 +2,7 @@ FROM dockette/debian:bookworm-slim LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 diff --git a/adminer-oracle-12/Dockerfile b/adminer-oracle-12/Dockerfile index 8cc7f1c..d8d7775 100644 --- a/adminer-oracle-12/Dockerfile +++ b/adminer-oracle-12/Dockerfile @@ -2,7 +2,7 @@ FROM dockette/debian:bookworm-slim LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 diff --git a/adminer-oracle-19/Dockerfile b/adminer-oracle-19/Dockerfile index 56b969b..0040bd1 100644 --- a/adminer-oracle-19/Dockerfile +++ b/adminer-oracle-19/Dockerfile @@ -2,7 +2,7 @@ FROM dockette/debian:bookworm-slim LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 diff --git a/adminer-postgres/Dockerfile b/adminer-postgres/Dockerfile index a3a57cd..31862a6 100644 --- a/adminer-postgres/Dockerfile +++ b/adminer-postgres/Dockerfile @@ -1,15 +1,15 @@ -FROM alpine:3.23 +FROM alpine:3.24 LABEL maintainer="Milan Sulc " -ENV ADMINER_VERSION=6.1.0 +ENV ADMINER_VERSION=6.1.1 ENV MEMORY=256M ENV UPLOAD=2048M ENV PORT=80 ENV WORKERS=8 ENV PHP_CLI_SERVER_WORKERS=${WORKERS} -RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.23/community' >> /etc/apk/repositories && \ +RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> /etc/apk/repositories && \ apk update && \ apk upgrade && \ apk add \ From 17fbc80721848e5e6dbf5441d08c1ccfdc145f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20Felix=20=C5=A0ulc?= Date: Sun, 27 Sep 2026 16:42:38 +0000 Subject: [PATCH 2/2] Docker: link php to php84 in Alpine images In Alpine 3.24 php85 is the default PHP, so the php84 package no longer creates /usr/bin/php. The entrypoints call php. adminer-mysql already had this link. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01VSKw7jY45nUJWQxWpvjm82 --- adminer-dg/Dockerfile | 1 + adminer-editor/Dockerfile | 1 + adminer-full/Dockerfile | 1 + adminer-mongo/Dockerfile | 1 + adminer-postgres/Dockerfile | 1 + 5 files changed, 5 insertions(+) diff --git a/adminer-dg/Dockerfile b/adminer-dg/Dockerfile index a2d75dc..6cf110c 100644 --- a/adminer-dg/Dockerfile +++ b/adminer-dg/Dockerfile @@ -23,6 +23,7 @@ RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> / php84-json@community \ php84-pecl-mongodb@community \ tini && \ + ln -s /usr/bin/php84 /usr/bin/php && \ 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 && \ diff --git a/adminer-editor/Dockerfile b/adminer-editor/Dockerfile index 39c1e3f..3c6c8b8 100644 --- a/adminer-editor/Dockerfile +++ b/adminer-editor/Dockerfile @@ -24,6 +24,7 @@ RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> / php84-json@community \ php84-pecl-mongodb@community \ tini && \ + ln -s /usr/bin/php84 /usr/bin/php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_EDITOR_VERSION/editor-$ADMINER_EDITOR_VERSION.php -O /srv/index.php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_EDITOR_VERSION/adminer-$ADMINER_EDITOR_VERSION.zip -O /tmp/adminer-$ADMINER_EDITOR_VERSION.zip && \ unzip /tmp/adminer-$ADMINER_EDITOR_VERSION.zip -d /tmp && \ diff --git a/adminer-full/Dockerfile b/adminer-full/Dockerfile index 155bdf6..f5ac217 100644 --- a/adminer-full/Dockerfile +++ b/adminer-full/Dockerfile @@ -25,6 +25,7 @@ RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> / php84-pecl-mongodb@community \ php84-sqlite3@community \ tini && \ + ln -s /usr/bin/php84 /usr/bin/php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.zip -O /tmp/adminer-$ADMINER_VERSION.zip && \ unzip /tmp/adminer-$ADMINER_VERSION.zip -d /tmp && \ diff --git a/adminer-mongo/Dockerfile b/adminer-mongo/Dockerfile index 55d9ba2..e740e04 100644 --- a/adminer-mongo/Dockerfile +++ b/adminer-mongo/Dockerfile @@ -21,6 +21,7 @@ RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> / php84-session@community \ php84-pecl-mongodb@community \ tini && \ + ln -s /usr/bin/php84 /usr/bin/php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.zip -O /tmp/adminer-$ADMINER_VERSION.zip && \ unzip /tmp/adminer-$ADMINER_VERSION.zip -d /tmp && \ diff --git a/adminer-postgres/Dockerfile b/adminer-postgres/Dockerfile index 31862a6..538a6ea 100644 --- a/adminer-postgres/Dockerfile +++ b/adminer-postgres/Dockerfile @@ -21,6 +21,7 @@ RUN echo '@community https://dl-cdn.alpinelinux.org/alpine/v3.24/community' >> / php84-session@community \ php84-pgsql@community \ tini && \ + ln -s /usr/bin/php84 /usr/bin/php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \ wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.zip -O /tmp/adminer-$ADMINER_VERSION.zip && \ unzip /tmp/adminer-$ADMINER_VERSION.zip -d /tmp && \