chore: add Ubuntu 22.04 with Freexian PHP 7.4 (#185)

phil-davis · web-flow · commit 3be37a2089c9 · 2025-04-28T13:55:37.000+02:00
diff --git a/.drone.star b/.drone.star
@@ -3,6 +3,10 @@ DRONE_DOCKER_BUILDX_IMAGE = "docker.io/owncloudci/drone-docker-buildx:4"
 
 def main(ctx):
     versions = [
+        {
+            "value": "22.04",
+            "tags": ["latest", "jammy"],
+        },
         {
             "value": "20.04",
             "tags": ["latest", "focal"],
@@ -170,6 +174,7 @@ def prepublish(config):
                     "from_secret": "internal_password",
                 },
                 "tags": config["internal"],
+                "build_args_from_env": ["DEB_MIRROR_URL", "DEB_MIRROR_LOGIN", "DEB_MIRROR_PWD"],
                 "dockerfile": "%s/Dockerfile.multiarch" % (config["version"]["path"]),
                 "repo": "registry.drone.owncloud.com/owncloud/%s" % config["repo"],
                 "registry": "registry.drone.owncloud.com",
@@ -178,6 +183,15 @@ def prepublish(config):
             },
             "environment": {
                 "BUILDKIT_NO_CLIENT_TOKEN": True,
+                "DEB_MIRROR_URL": {
+                    "from_secret": "DEB_MIRROR_URL",
+                },
+                "DEB_MIRROR_LOGIN": {
+                    "from_secret": "DEB_MIRROR_LOGIN",
+                },
+                "DEB_MIRROR_PWD": {
+                    "from_secret": "DEB_MIRROR_PWD",
+                },
             },
         },
     ]
@@ -254,11 +268,23 @@ def publish(config):
                     "linux/arm64",
                 ],
                 "tags": config["version"]["tags"],
+                "build_args_from_env": ["DEB_MIRROR_URL", "DEB_MIRROR_LOGIN", "DEB_MIRROR_PWD"],
                 "dockerfile": "%s/Dockerfile.multiarch" % (config["version"]["path"]),
                 "repo": "owncloud/%s" % config["repo"],
                 "context": config["version"]["path"],
                 "pull_image": False,
             },
+            "environment": {
+                "DEB_MIRROR_URL": {
+                    "from_secret": "DEB_MIRROR_URL",
+                },
+                "DEB_MIRROR_LOGIN": {
+                    "from_secret": "DEB_MIRROR_LOGIN",
+                },
+                "DEB_MIRROR_PWD": {
+                    "from_secret": "DEB_MIRROR_PWD",
+                },
+            },
             "when": {
                 "ref": [
                     "refs/heads/master",
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2025-04-15
+
+* Added
+  * Add Ubuntu 22.04 with Freexian PHP 7.4
+
 ## 2023-08-18
 
 * Added
diff --git a/README.md b/README.md
@@ -22,6 +22,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`
+- [`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/v22.04/Dockerfile.multiarch b/v22.04/Dockerfile.multiarch
@@ -0,0 +1,80 @@
+FROM docker.io/owncloud/ubuntu:22.04
+
+LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
+  org.opencontainers.image.authors="ownCloud DevOps <devops@owncloud.com>" \
+  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"
+
+ARG DEB_MIRROR_URL
+ARG DEB_MIRROR_LOGIN
+ARG DEB_MIRROR_PWD
+
+EXPOSE 8080
+
+ENTRYPOINT ["/usr/bin/entrypoint"]
+CMD ["/usr/bin/server"]
+
+# Get the key that the Freexian deb mirror uses for signing
+RUN wget http://php.freexian.com/public/archive-key.gpg -O /etc/apt/trusted.gpg.d/freexian-archive-php.gpg
+# Get the authentication details for the deb mirror that has been set up to serve the Freexian PHP packages
+RUN echo "machine $DEB_MIRROR_URL login $DEB_MIRROR_LOGIN password $DEB_MIRROR_PWD" > /etc/apt/auth.conf.d/freexian.conf
+
+RUN apt-get update -y && \
+  apt-get install -y software-properties-common language-pack-en-base && \
+  apt-add-repository "https://$DEB_MIRROR_URL/php.freexian.com/ bookworm main" && \
+  LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/apache2
+
+RUN apt-get update -y && \
+  apt-get install --no-install-recommends -y \
+    apache2 \
+    libapache2-mod-php7.4 \
+    php7.4 \
+    php7.4-gd \
+    php7.4-json \
+    php7.4-mysql \
+    php7.4-sqlite3 \
+    php7.4-pgsql \
+    php7.4-curl \
+    php7.4-intl \
+    php7.4-zip \
+    php7.4-xml \
+    php7.4-mbstring \
+    php7.4-soap \
+    php7.4-ldap \
+    php7.4-apcu php7.4-apcu-bc \
+    php7.4-redis \
+    php7.4-dev libsmbclient-dev make \
+    php7.4-gmp \
+    smbclient samba-common samba-common-bin samba-dsdb-modules \
+    libgomp1 \
+    liblcms2-2 \
+    liblqr-1-0 \
+    libfftw3-3 \
+    libxext6 \
+    libltdl7 \
+    libde265-0 \
+    libx265-199 \
+    exiftool \
+    sqlite3 \
+    librsvg2-common \
+    ghostscript && \
+  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 && \
+  apt-get purge -y '*-dev' git cmake automake libtool yasm g++ gsfonts ffmpeg less pkg-config xz-utils 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
+
+# delete the file that has the authentication for the Freexian deb package server, so that it can't end up in the built docker image
+RUN rm -f /etc/apt/auth.conf.d/freexian.conf
+
+ADD overlay /
+WORKDIR /var/www/html
diff --git a/v22.04/overlay/etc/apache2/apache2.conf b/v22.04/overlay/etc/apache2/apache2.conf
@@ -0,0 +1,51 @@
+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
+
+<Directory />
+  Options FollowSymLinks
+  AllowOverride None
+  Require all denied
+</Directory>
+
+<Directory /usr/share>
+  AllowOverride None
+  Require all granted
+</Directory>
+
+<Directory /var/www/>
+  Options Indexes FollowSymLinks
+  AllowOverride None
+  Require all granted
+</Directory>
+
+<FilesMatch "^\.ht">
+  Require all denied
+</FilesMatch>
+
+IncludeOptional conf-enabled/*.conf
+IncludeOptional sites-enabled/*.conf
diff --git a/v22.04/overlay/etc/apache2/conf-enabled/charset.conf b/v22.04/overlay/etc/apache2/conf-enabled/charset.conf
@@ -0,0 +1 @@
+AddDefaultCharset ${APACHE_ADD_DEFAULT_CHARSET}
diff --git a/v22.04/overlay/etc/apache2/conf-enabled/remoteip.conf b/v22.04/overlay/etc/apache2/conf-enabled/remoteip.conf
@@ -0,0 +1 @@
+RemoteIPHeader X-Forwarded-For
diff --git a/v22.04/overlay/etc/apache2/conf-enabled/security.conf b/v22.04/overlay/etc/apache2/conf-enabled/security.conf
@@ -0,0 +1,3 @@
+ServerTokens ${APACHE_SERVER_TOKENS}
+ServerSignature ${APACHE_SERVER_SIGNATURE}
+TraceEnable ${APACHE_TRACE_ENABLE}
diff --git a/v22.04/overlay/etc/apache2/conf-enabled/servername.conf b/v22.04/overlay/etc/apache2/conf-enabled/servername.conf
@@ -0,0 +1 @@
+ServerName ${APACHE_SERVER_NAME}
diff --git a/v22.04/overlay/etc/apache2/ports.conf b/v22.04/overlay/etc/apache2/ports.conf
@@ -0,0 +1 @@
+Listen ${APACHE_LISTEN}
diff --git a/v22.04/overlay/etc/apache2/sites-enabled/default.conf b/v22.04/overlay/etc/apache2/sites-enabled/default.conf
@@ -0,0 +1,13 @@
+<VirtualHost *:${APACHE_LISTEN}>
+  ServerAdmin ${APACHE_SERVER_ADMIN}
+
+  DocumentRoot ${APACHE_DOCUMENT_ROOT}
+
+  ErrorLog ${APACHE_ERROR_LOG}
+  CustomLog ${APACHE_ACCESS_LOG} ${APACHE_LOG_FORMAT}
+
+  <Directory ${APACHE_DOCUMENT_ROOT}>
+    AllowOverride All
+    Options +Indexes +FollowSymlinks
+  </Directory>
+</VirtualHost>
diff --git a/v22.04/overlay/etc/entrypoint.d/99-apache.sh b/v22.04/overlay/etc/entrypoint.d/99-apache.sh
@@ -0,0 +1,81 @@
+#!/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/v22.04/overlay/usr/bin/entrypoint b/v22.04/overlay/usr/bin/entrypoint
@@ -0,0 +1,10 @@
+#!/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/v22.04/overlay/usr/bin/healthcheck b/v22.04/overlay/usr/bin/healthcheck
@@ -0,0 +1,18 @@
+#!/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/v22.04/overlay/usr/bin/server b/v22.04/overlay/usr/bin/server
@@ -0,0 +1,12 @@
+#!/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/v22.04/overlay/var/www/html/index.html b/v22.04/overlay/var/www/html/index.html

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+AddDefaultCharset ${APACHE_ADD_DEFAULT_CHARSET}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ServerTokens ${APACHE_SERVER_TOKENS}`
	`2`	`+ServerSignature ${APACHE_SERVER_SIGNATURE}`
	`3`	`+TraceEnable ${APACHE_TRACE_ENABLE}`