From 1cc6fce8f34a0071adf58049414f0f17763e1dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= <1005065+DeepDiver1975@users.noreply.github.com> Date: Thu, 2 Apr 2026 20:15:42 +0200 Subject: [PATCH] chore: drop v20.04 --- README.md | 2 +- v20.04/Dockerfile.multiarch | 69 ---------------- v20.04/overlay/etc/apache2/apache2.conf | 51 ------------ .../etc/apache2/conf-enabled/charset.conf | 1 - .../etc/apache2/conf-enabled/remoteip.conf | 1 - .../etc/apache2/conf-enabled/security.conf | 3 - .../etc/apache2/conf-enabled/servername.conf | 1 - v20.04/overlay/etc/apache2/ports.conf | 1 - .../etc/apache2/sites-enabled/default.conf | 13 --- v20.04/overlay/etc/entrypoint.d/99-apache.sh | 81 ------------------- v20.04/overlay/usr/bin/entrypoint | 10 --- v20.04/overlay/usr/bin/healthcheck | 18 ----- v20.04/overlay/usr/bin/server | 12 --- v20.04/overlay/var/www/html/index.html | 0 14 files changed, 1 insertion(+), 262 deletions(-) delete mode 100644 v20.04/Dockerfile.multiarch delete mode 100644 v20.04/overlay/etc/apache2/apache2.conf delete mode 100644 v20.04/overlay/etc/apache2/conf-enabled/charset.conf delete mode 100644 v20.04/overlay/etc/apache2/conf-enabled/remoteip.conf delete mode 100644 v20.04/overlay/etc/apache2/conf-enabled/security.conf delete mode 100644 v20.04/overlay/etc/apache2/conf-enabled/servername.conf delete mode 100644 v20.04/overlay/etc/apache2/ports.conf delete mode 100644 v20.04/overlay/etc/apache2/sites-enabled/default.conf delete mode 100755 v20.04/overlay/etc/entrypoint.d/99-apache.sh delete mode 100755 v20.04/overlay/usr/bin/entrypoint delete mode 100755 v20.04/overlay/usr/bin/healthcheck delete mode 100755 v20.04/overlay/usr/bin/server delete mode 100644 v20.04/overlay/var/www/html/index.html diff --git a/README.md b/README.md index 11fe59a..79e7d5c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ ownCloud Docker PHP and webserver base image. ## Docker Tags and respective Dockerfile links -- [`20.04`](https://github.com/owncloud-docker/php/blob/master/v20.04/Dockerfile.multiarch) available as `owncloud/php:20.04`, `owncloud/php:latest` +- [`24.04`](https://github.com/owncloud-docker/php/blob/master/v24.04/Dockerfile.multiarch) available as `owncloud/php:24.04` - [`22.04`](https://github.com/owncloud-docker/php/blob/master/v22.04/Dockerfile.multiarch) available as `owncloud/php:22.04` ## Default volumes diff --git a/v20.04/Dockerfile.multiarch b/v20.04/Dockerfile.multiarch deleted file mode 100644 index 5e027d9..0000000 --- a/v20.04/Dockerfile.multiarch +++ /dev/null @@ -1,69 +0,0 @@ -FROM owncloud/ubuntu:20.04@sha256:ae5ffb91c7aaa60d4cd709227746e8027f4fb7ff684a0813ade8f3e7ded2a22e - -LABEL maintainer="ownCloud GmbH " \ - org.opencontainers.image.authors="ownCloud DevOps " \ - org.opencontainers.image.title="ownCloud PHP" \ - org.opencontainers.image.url="https://hub.docker.com/r/owncloud/php" \ - org.opencontainers.image.source="https://github.com/owncloud-docker/php" \ - org.opencontainers.image.documentation="https://github.com/owncloud-docker/php" - -EXPOSE 8080 - -ENTRYPOINT ["/usr/bin/entrypoint"] -CMD ["/usr/bin/server"] - -RUN apt-get update -y && \ - apt-get install --no-install-recommends -y \ - apache2 \ - libapache2-mod-php \ - php-gd \ - php-json \ - php-mysql \ - php-sqlite3 \ - php-pgsql \ - php-curl \ - php-intl \ - php-zip \ - php-xml \ - php-mbstring \ - php-soap \ - php-ldap \ - php-apcu php-apcu-bc \ - php-redis \ - php-dev libsmbclient-dev php-pear make \ - php-gmp \ - smbclient samba-common samba-common-bin samba-dsdb-modules \ - libgomp1 \ - liblcms2-2 \ - liblqr-1-0 \ - libfftw3-3 \ - libxext6 \ - libltdl7 \ - libde265-0 \ - libx265-179 \ - exiftool \ - sqlite3 \ - librsvg2-common \ - ghostscript && \ - pecl channel-update pecl.php.net && \ - pecl install smbclient-stable && \ - echo 'extension=smbclient.so' > /etc/php/7.4/mods-available/smbclient.ini && \ - phpenmod smbclient && \ - rm -rf /etc/apache2/envvars /etc/apache2/conf-* /etc/apache2/sites-* /var/log/apache2/* && \ - a2enmod rewrite headers env dir mime expires remoteip && \ - mkdir -p /var/www/html && \ - mkdir -p /var/www/.cache && \ - chown -R www-data:www-data /var/www/html /var/www/.cache /var/log/apache2 /var/run/apache2 && \ - chsh -s /bin/bash www-data && \ - curl -sSfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ - curl -sSfL https://dist.1-2.dev/imei.sh | env BUILD_CFLAGS="-O2 -mtune=generic" BUILD_CXXFLAGS="-O2 -mtune=generic" bash && \ - echo | pecl install imagick && \ - echo 'extension=imagick.so' > /etc/php/7.4/mods-available/imagick.ini && \ - phpenmod imagick && \ - apt-get purge -y '*-dev' git cmake automake libtool yasm g++ gsfonts ffmpeg less pkg-config xz-utils php-pear make && \ - apt-get update && apt-get -y --purge autoremove && \ - rm -rf /var/lib/apt/lists/* /usr/local/share/doc/* /usr/local/include/* /tmp/* && \ - apt-get clean - -ADD overlay / -WORKDIR /var/www/html diff --git a/v20.04/overlay/etc/apache2/apache2.conf b/v20.04/overlay/etc/apache2/apache2.conf deleted file mode 100644 index 81b90f6..0000000 --- a/v20.04/overlay/etc/apache2/apache2.conf +++ /dev/null @@ -1,51 +0,0 @@ -ServerRoot "/etc/apache2" - -Mutex file:${APACHE_LOCK_DIR} default -DefaultRuntimeDir ${APACHE_RUN_DIR} -PidFile ${APACHE_PID_FILE} -Timeout ${APACHE_TIMEOUT} -KeepAlive ${APACHE_KEEP_ALIVE} -MaxKeepAliveRequests ${APACHE_MAX_KEEP_ALIVE_REQUESTS} -KeepAliveTimeout ${APACHE_KEEP_ALIVE_TIMEOUT} - -User ${APACHE_RUN_USER} -Group ${APACHE_RUN_GROUP} - -HostnameLookups ${APACHE_HOSTNAME_LOOKUPS} -AccessFileName ${APACHE_ACCESS_FILE_NAME} - -ErrorLog ${APACHE_ERROR_LOG} -LogLevel ${APACHE_LOG_LEVEL} - -LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined -LogFormat "%a %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\" \"%{X-Request-ID}i\"" requestid -LogFormat "%a %l %u %t \"%r\" %>s %O" common - -IncludeOptional mods-enabled/*.load -IncludeOptional mods-enabled/*.conf - -Include ports.conf - - - Options FollowSymLinks - AllowOverride None - Require all denied - - - - AllowOverride None - Require all granted - - - - Options Indexes FollowSymLinks - AllowOverride None - Require all granted - - - - Require all denied - - -IncludeOptional conf-enabled/*.conf -IncludeOptional sites-enabled/*.conf diff --git a/v20.04/overlay/etc/apache2/conf-enabled/charset.conf b/v20.04/overlay/etc/apache2/conf-enabled/charset.conf deleted file mode 100644 index 7d0dfbc..0000000 --- a/v20.04/overlay/etc/apache2/conf-enabled/charset.conf +++ /dev/null @@ -1 +0,0 @@ -AddDefaultCharset ${APACHE_ADD_DEFAULT_CHARSET} diff --git a/v20.04/overlay/etc/apache2/conf-enabled/remoteip.conf b/v20.04/overlay/etc/apache2/conf-enabled/remoteip.conf deleted file mode 100644 index b60f2a7..0000000 --- a/v20.04/overlay/etc/apache2/conf-enabled/remoteip.conf +++ /dev/null @@ -1 +0,0 @@ -RemoteIPHeader X-Forwarded-For diff --git a/v20.04/overlay/etc/apache2/conf-enabled/security.conf b/v20.04/overlay/etc/apache2/conf-enabled/security.conf deleted file mode 100644 index 3e5b331..0000000 --- a/v20.04/overlay/etc/apache2/conf-enabled/security.conf +++ /dev/null @@ -1,3 +0,0 @@ -ServerTokens ${APACHE_SERVER_TOKENS} -ServerSignature ${APACHE_SERVER_SIGNATURE} -TraceEnable ${APACHE_TRACE_ENABLE} diff --git a/v20.04/overlay/etc/apache2/conf-enabled/servername.conf b/v20.04/overlay/etc/apache2/conf-enabled/servername.conf deleted file mode 100644 index dee4bcc..0000000 --- a/v20.04/overlay/etc/apache2/conf-enabled/servername.conf +++ /dev/null @@ -1 +0,0 @@ -ServerName ${APACHE_SERVER_NAME} diff --git a/v20.04/overlay/etc/apache2/ports.conf b/v20.04/overlay/etc/apache2/ports.conf deleted file mode 100644 index 9477d45..0000000 --- a/v20.04/overlay/etc/apache2/ports.conf +++ /dev/null @@ -1 +0,0 @@ -Listen ${APACHE_LISTEN} diff --git a/v20.04/overlay/etc/apache2/sites-enabled/default.conf b/v20.04/overlay/etc/apache2/sites-enabled/default.conf deleted file mode 100644 index cfafbef..0000000 --- a/v20.04/overlay/etc/apache2/sites-enabled/default.conf +++ /dev/null @@ -1,13 +0,0 @@ - - ServerAdmin ${APACHE_SERVER_ADMIN} - - DocumentRoot ${APACHE_DOCUMENT_ROOT} - - ErrorLog ${APACHE_ERROR_LOG} - CustomLog ${APACHE_ACCESS_LOG} ${APACHE_LOG_FORMAT} - - - AllowOverride All - Options +Indexes +FollowSymlinks - - diff --git a/v20.04/overlay/etc/entrypoint.d/99-apache.sh b/v20.04/overlay/etc/entrypoint.d/99-apache.sh deleted file mode 100755 index 08e6924..0000000 --- a/v20.04/overlay/etc/entrypoint.d/99-apache.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/usr/bin/env bash - -declare -x HOME -[[ -z "${HOME}" ]] && HOME="/var/www/html" - -declare -x LANG -[[ -z "${LANG}" ]] && LANG="C" - -declare -x APACHE_RUN_USER -[[ -z "${APACHE_RUN_USER}" ]] && APACHE_RUN_USER="www-data" - -declare -x APACHE_RUN_GROUP -[[ -z "${APACHE_RUN_GROUP}" ]] && APACHE_RUN_GROUP="www-data" - -declare -x APACHE_RUN_DIR -[[ -z "${APACHE_RUN_DIR}" ]] && APACHE_RUN_DIR="/var/run/apache2" - -declare -x APACHE_PID_FILE -[[ -z "${APACHE_PID_FILE}" ]] && APACHE_PID_FILE="${APACHE_RUN_DIR}/apache2.pid" - -declare -x APACHE_LOCK_DIR -[[ -z "${APACHE_LOCK_DIR}" ]] && APACHE_LOCK_DIR="/var/lock/apache2" - -declare -x APACHE_ERROR_LOG -[[ -z "${APACHE_ERROR_LOG}" ]] && APACHE_ERROR_LOG="/dev/stderr" - -declare -x APACHE_ACCESS_LOG -[[ -z "${APACHE_ACCESS_LOG}" ]] && APACHE_ACCESS_LOG="/dev/stdout" - -declare -x APACHE_LOG_FORMAT -[[ -z "${APACHE_LOG_FORMAT}" ]] && APACHE_LOG_FORMAT="combined" - -declare -x APACHE_LOG_LEVEL -[[ -z "${APACHE_LOG_LEVEL}" ]] && APACHE_LOG_LEVEL="warn" - -declare -x APACHE_DOCUMENT_ROOT -[[ -z "${APACHE_DOCUMENT_ROOT}" ]] && APACHE_DOCUMENT_ROOT="/var/www/html" - -declare -x APACHE_SERVER_NAME -[[ -z "${APACHE_SERVER_NAME}" ]] && APACHE_SERVER_NAME="localhost" - -declare -x APACHE_SERVER_ADMIN -[[ -z "${APACHE_SERVER_ADMIN}" ]] && APACHE_SERVER_ADMIN="webmaster@localhost" - -declare -x APACHE_SERVER_TOKENS -[[ -z "${APACHE_SERVER_TOKENS}" ]] && APACHE_SERVER_TOKENS="Prod" - -declare -x APACHE_SERVER_SIGNATURE -[[ -z "${APACHE_SERVER_SIGNATURE}" ]] && APACHE_SERVER_SIGNATURE="Off" - -declare -x APACHE_TRACE_ENABLE -[[ -z "${APACHE_TRACE_ENABLE}" ]] && APACHE_TRACE_ENABLE="Off" - -declare -x APACHE_TIMEOUT -[[ -z "${APACHE_TIMEOUT}" ]] && APACHE_TIMEOUT="300" - -declare -x APACHE_KEEP_ALIVE -[[ -z "${APACHE_KEEP_ALIVE}" ]] && APACHE_KEEP_ALIVE="On" - -declare -x APACHE_MAX_KEEP_ALIVE_REQUESTS -[[ -z "${APACHE_MAX_KEEP_ALIVE_REQUESTS}" ]] && APACHE_MAX_KEEP_ALIVE_REQUESTS="100" - -declare -x APACHE_KEEP_ALIVE_TIMEOUT -[[ -z "${APACHE_KEEP_ALIVE_TIMEOUT}" ]] && APACHE_KEEP_ALIVE_TIMEOUT="5" - -declare -x APACHE_ADD_DEFAULT_CHARSET -[[ -z "${APACHE_ADD_DEFAULT_CHARSET}" ]] && APACHE_ADD_DEFAULT_CHARSET="UTF-8" - -declare -x APACHE_HOSTNAME_LOOKUPS -[[ -z "${APACHE_HOSTNAME_LOOKUPS}" ]] && APACHE_HOSTNAME_LOOKUPS="Off" - -declare -x APACHE_ACCESS_FILE_NAME -[[ -z "${APACHE_ACCESS_FILE_NAME}" ]] && APACHE_ACCESS_FILE_NAME=".htaccess" - -declare -x APACHE_LISTEN -[[ -z "${APACHE_LISTEN}" ]] && APACHE_LISTEN="8080" - -declare -x APACHE_ENTRYPOINT_INITIALIZED -[[ -z "${APACHE_ENTRYPOINT_INITIALIZED}" ]] && APACHE_ENTRYPOINT_INITIALIZED="true" - -true diff --git a/v20.04/overlay/usr/bin/entrypoint b/v20.04/overlay/usr/bin/entrypoint deleted file mode 100755 index 3f97035..0000000 --- a/v20.04/overlay/usr/bin/entrypoint +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail -[[ "${DEBUG}" == "true" ]] && set -x - -for FILE in $(find /etc/entrypoint.d -iname "*.sh" | sort); do - # shellcheck disable=SC1090,SC2086 - source ${FILE} -done - -exec "$@" diff --git a/v20.04/overlay/usr/bin/healthcheck b/v20.04/overlay/usr/bin/healthcheck deleted file mode 100755 index b636e62..0000000 --- a/v20.04/overlay/usr/bin/healthcheck +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail -[[ "${DEBUG}" == "true" ]] && set -x - -if [[ -z "${APACHE_ENTRYPOINT_INITIALIZED}" ]]; then - for FILE in $(find /etc/entrypoint.d -iname "*.sh" | sort); do - # shellcheck disable=SC1090,SC2086 - source ${FILE} - done -fi - -CHECK="$(curl -sL -w "%{http_code}" -o /dev/null "http://localhost:${APACHE_LISTEN:-8080}/")" - -if [[ "${CHECK}" == "200" ]]; then - exit 0 -fi - -exit 1 diff --git a/v20.04/overlay/usr/bin/server b/v20.04/overlay/usr/bin/server deleted file mode 100755 index 0665a32..0000000 --- a/v20.04/overlay/usr/bin/server +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail -[[ "${DEBUG}" == "true" ]] && set -x - -if [[ -z "${APACHE_ENTRYPOINT_INITIALIZED}" ]]; then - for FILE in $(find /etc/entrypoint.d -iname "*.sh" | sort); do - # shellcheck disable=SC1090,SC2086 - source ${FILE} - done -fi - -exec apachectl -f /etc/apache2/apache2.conf -DFOREGROUND diff --git a/v20.04/overlay/var/www/html/index.html b/v20.04/overlay/var/www/html/index.html deleted file mode 100644 index e69de29..0000000