From 759e45b8603f31e7dc5b427f7f4b91f45f5f6f8b Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 12 Oct 2022 11:01:24 +0545 Subject: [PATCH 1/2] Rename v7.4 to v7.4-ubuntu18.04 --- {v7.4 => v7.4-ubuntu18.04}/Dockerfile.amd64 | 0 {v7.4 => v7.4-ubuntu18.04}/Dockerfile.arm64v8 | 0 {v7.4 => v7.4-ubuntu18.04}/manifest.tmpl | 6 +++--- .../overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini | 0 .../overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini | 0 .../overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini | 0 .../overlay-amd64/etc/php/7.4/mods-available/oci8.ini | 0 .../overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini | 0 {v7.4 => v7.4-ubuntu18.04}/overlay-arm64v8/.keep | 0 .../overlay/etc/ImageMagick-6/policy.xml | 0 .../overlay/etc/apache2/conf-enabled/security.conf | 0 .../overlay/etc/apache2/conf-enabled/servername.conf | 0 .../overlay/etc/apache2/sites-enabled/000-default.conf | 0 {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/ssl/.keep | 0 .../overlay/etc/apache2/templates/base | 0 .../overlay/etc/apache2/templates/ssl | 0 .../overlay/etc/apache2/templates/webdav | 0 {v7.4 => v7.4-ubuntu18.04}/overlay/etc/ldap/ldap.conf | 0 .../etc/php/7.4/apache2/conf.d/10-opcache-custom.ini | 0 .../overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini | 0 .../overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini | 0 .../overlay/etc/php/7.4/mods-available/opcache-custom.ini | 0 .../overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini | 0 {v7.4 => v7.4-ubuntu18.04}/overlay/root/.bowerrc | 0 {v7.4 => v7.4-ubuntu18.04}/overlay/usr/local/bin/apachectl | 0 .../overlay/var/www/owncloud/index.html | 0 26 files changed, 3 insertions(+), 3 deletions(-) rename {v7.4 => v7.4-ubuntu18.04}/Dockerfile.amd64 (100%) rename {v7.4 => v7.4-ubuntu18.04}/Dockerfile.arm64v8 (100%) rename {v7.4 => v7.4-ubuntu18.04}/manifest.tmpl (50%) rename {v7.4 => v7.4-ubuntu18.04}/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay-amd64/etc/php/7.4/mods-available/oci8.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay-arm64v8/.keep (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/ImageMagick-6/policy.xml (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/conf-enabled/security.conf (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/conf-enabled/servername.conf (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/sites-enabled/000-default.conf (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/ssl/.keep (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/templates/base (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/templates/ssl (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/apache2/templates/webdav (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/ldap/ldap.conf (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/php/7.4/mods-available/opcache-custom.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/root/.bowerrc (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/usr/local/bin/apachectl (100%) rename {v7.4 => v7.4-ubuntu18.04}/overlay/var/www/owncloud/index.html (100%) diff --git a/v7.4/Dockerfile.amd64 b/v7.4-ubuntu18.04/Dockerfile.amd64 similarity index 100% rename from v7.4/Dockerfile.amd64 rename to v7.4-ubuntu18.04/Dockerfile.amd64 diff --git a/v7.4/Dockerfile.arm64v8 b/v7.4-ubuntu18.04/Dockerfile.arm64v8 similarity index 100% rename from v7.4/Dockerfile.arm64v8 rename to v7.4-ubuntu18.04/Dockerfile.arm64v8 diff --git a/v7.4/manifest.tmpl b/v7.4-ubuntu18.04/manifest.tmpl similarity index 50% rename from v7.4/manifest.tmpl rename to v7.4-ubuntu18.04/manifest.tmpl index 32272403..3b941932 100644 --- a/v7.4/manifest.tmpl +++ b/v7.4-ubuntu18.04/manifest.tmpl @@ -1,10 +1,10 @@ -image: owncloudci/php:7.4 +image: owncloudci/php:7.4-ubuntu18.04 manifests: - - image: owncloudci/php:7.4-amd64 + - image: owncloudci/php:7.4-ubuntu18.04-amd64 platform: architecture: amd64 os: linux - - image: owncloudci/php:7.4-arm64v8 + - image: owncloudci/php:7.4-ubuntu18.04-arm64v8 platform: architecture: arm64 variant: v8 diff --git a/v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini b/v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini similarity index 100% rename from v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini rename to v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini diff --git a/v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini b/v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini similarity index 100% rename from v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini rename to v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini diff --git a/v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini b/v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini similarity index 100% rename from v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini rename to v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini diff --git a/v7.4/overlay-amd64/etc/php/7.4/mods-available/oci8.ini b/v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/mods-available/oci8.ini similarity index 100% rename from v7.4/overlay-amd64/etc/php/7.4/mods-available/oci8.ini rename to v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/mods-available/oci8.ini diff --git a/v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini b/v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini similarity index 100% rename from v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini rename to v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini diff --git a/v7.4/overlay-arm64v8/.keep b/v7.4-ubuntu18.04/overlay-arm64v8/.keep similarity index 100% rename from v7.4/overlay-arm64v8/.keep rename to v7.4-ubuntu18.04/overlay-arm64v8/.keep diff --git a/v7.4/overlay/etc/ImageMagick-6/policy.xml b/v7.4-ubuntu18.04/overlay/etc/ImageMagick-6/policy.xml similarity index 100% rename from v7.4/overlay/etc/ImageMagick-6/policy.xml rename to v7.4-ubuntu18.04/overlay/etc/ImageMagick-6/policy.xml diff --git a/v7.4/overlay/etc/apache2/conf-enabled/security.conf b/v7.4-ubuntu18.04/overlay/etc/apache2/conf-enabled/security.conf similarity index 100% rename from v7.4/overlay/etc/apache2/conf-enabled/security.conf rename to v7.4-ubuntu18.04/overlay/etc/apache2/conf-enabled/security.conf diff --git a/v7.4/overlay/etc/apache2/conf-enabled/servername.conf b/v7.4-ubuntu18.04/overlay/etc/apache2/conf-enabled/servername.conf similarity index 100% rename from v7.4/overlay/etc/apache2/conf-enabled/servername.conf rename to v7.4-ubuntu18.04/overlay/etc/apache2/conf-enabled/servername.conf diff --git a/v7.4/overlay/etc/apache2/sites-enabled/000-default.conf b/v7.4-ubuntu18.04/overlay/etc/apache2/sites-enabled/000-default.conf similarity index 100% rename from v7.4/overlay/etc/apache2/sites-enabled/000-default.conf rename to v7.4-ubuntu18.04/overlay/etc/apache2/sites-enabled/000-default.conf diff --git a/v7.4/overlay/etc/apache2/ssl/.keep b/v7.4-ubuntu18.04/overlay/etc/apache2/ssl/.keep similarity index 100% rename from v7.4/overlay/etc/apache2/ssl/.keep rename to v7.4-ubuntu18.04/overlay/etc/apache2/ssl/.keep diff --git a/v7.4/overlay/etc/apache2/templates/base b/v7.4-ubuntu18.04/overlay/etc/apache2/templates/base similarity index 100% rename from v7.4/overlay/etc/apache2/templates/base rename to v7.4-ubuntu18.04/overlay/etc/apache2/templates/base diff --git a/v7.4/overlay/etc/apache2/templates/ssl b/v7.4-ubuntu18.04/overlay/etc/apache2/templates/ssl similarity index 100% rename from v7.4/overlay/etc/apache2/templates/ssl rename to v7.4-ubuntu18.04/overlay/etc/apache2/templates/ssl diff --git a/v7.4/overlay/etc/apache2/templates/webdav b/v7.4-ubuntu18.04/overlay/etc/apache2/templates/webdav similarity index 100% rename from v7.4/overlay/etc/apache2/templates/webdav rename to v7.4-ubuntu18.04/overlay/etc/apache2/templates/webdav diff --git a/v7.4/overlay/etc/ldap/ldap.conf b/v7.4-ubuntu18.04/overlay/etc/ldap/ldap.conf similarity index 100% rename from v7.4/overlay/etc/ldap/ldap.conf rename to v7.4-ubuntu18.04/overlay/etc/ldap/ldap.conf diff --git a/v7.4/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini b/v7.4-ubuntu18.04/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini similarity index 100% rename from v7.4/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini rename to v7.4-ubuntu18.04/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini diff --git a/v7.4/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini b/v7.4-ubuntu18.04/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini similarity index 100% rename from v7.4/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini rename to v7.4-ubuntu18.04/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini diff --git a/v7.4/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini b/v7.4-ubuntu18.04/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini similarity index 100% rename from v7.4/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini rename to v7.4-ubuntu18.04/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini diff --git a/v7.4/overlay/etc/php/7.4/mods-available/opcache-custom.ini b/v7.4-ubuntu18.04/overlay/etc/php/7.4/mods-available/opcache-custom.ini similarity index 100% rename from v7.4/overlay/etc/php/7.4/mods-available/opcache-custom.ini rename to v7.4-ubuntu18.04/overlay/etc/php/7.4/mods-available/opcache-custom.ini diff --git a/v7.4/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini b/v7.4-ubuntu18.04/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini similarity index 100% rename from v7.4/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini rename to v7.4-ubuntu18.04/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini diff --git a/v7.4/overlay/root/.bowerrc b/v7.4-ubuntu18.04/overlay/root/.bowerrc similarity index 100% rename from v7.4/overlay/root/.bowerrc rename to v7.4-ubuntu18.04/overlay/root/.bowerrc diff --git a/v7.4/overlay/usr/local/bin/apachectl b/v7.4-ubuntu18.04/overlay/usr/local/bin/apachectl similarity index 100% rename from v7.4/overlay/usr/local/bin/apachectl rename to v7.4-ubuntu18.04/overlay/usr/local/bin/apachectl diff --git a/v7.4/overlay/var/www/owncloud/index.html b/v7.4-ubuntu18.04/overlay/var/www/owncloud/index.html similarity index 100% rename from v7.4/overlay/var/www/owncloud/index.html rename to v7.4-ubuntu18.04/overlay/var/www/owncloud/index.html From 20a88bb213716a4744e0bb6f7883f1df0d879784 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 12 Oct 2022 11:05:12 +0545 Subject: [PATCH 2/2] Copy v7.4-ubuntu20.04 to v7.4 --- v7.4/Dockerfile.amd64 | 52 ++++++++++++++ v7.4/Dockerfile.arm64v8 | 34 +++++++++ v7.4/manifest.tmpl | 11 +++ .../etc/php/7.4/apache2/conf.d/20-oci8.ini | 1 + .../etc/php/7.4/cli/conf.d/20-oci8.ini | 1 + .../etc/php/7.4/fpm/conf.d/20-oci8.ini | 1 + .../etc/php/7.4/mods-available/oci8.ini | 1 + .../etc/php/7.4/phpdbg/conf.d/20-oci8.ini | 1 + v7.4/overlay-arm64v8/.keep | 0 v7.4/overlay/etc/ImageMagick-6/policy.xml | 69 +++++++++++++++++++ .../etc/apache2/conf-enabled/security.conf | 3 + .../etc/apache2/conf-enabled/servername.conf | 1 + .../apache2/sites-enabled/000-default.conf | 7 ++ v7.4/overlay/etc/apache2/ssl/.keep | 0 v7.4/overlay/etc/apache2/templates/base | 13 ++++ v7.4/overlay/etc/apache2/templates/ssl | 19 +++++ v7.4/overlay/etc/apache2/templates/webdav | 25 +++++++ v7.4/overlay/etc/ldap/ldap.conf | 1 + .../7.4/apache2/conf.d/10-opcache-custom.ini | 1 + .../php/7.4/cli/conf.d/10-opcache-custom.ini | 1 + .../php/7.4/fpm/conf.d/10-opcache-custom.ini | 1 + .../php/7.4/mods-available/opcache-custom.ini | 1 + .../7.4/phpdbg/conf.d/10-opcache-custom.ini | 1 + v7.4/overlay/root/.bowerrc | 1 + v7.4/overlay/usr/local/bin/apachectl | 52 ++++++++++++++ v7.4/overlay/var/www/owncloud/index.html | 0 26 files changed, 298 insertions(+) create mode 100644 v7.4/Dockerfile.amd64 create mode 100644 v7.4/Dockerfile.arm64v8 create mode 100644 v7.4/manifest.tmpl create mode 100644 v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini create mode 100644 v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini create mode 100644 v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini create mode 100644 v7.4/overlay-amd64/etc/php/7.4/mods-available/oci8.ini create mode 100644 v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini create mode 100644 v7.4/overlay-arm64v8/.keep create mode 100644 v7.4/overlay/etc/ImageMagick-6/policy.xml create mode 100644 v7.4/overlay/etc/apache2/conf-enabled/security.conf create mode 100644 v7.4/overlay/etc/apache2/conf-enabled/servername.conf create mode 100644 v7.4/overlay/etc/apache2/sites-enabled/000-default.conf create mode 100644 v7.4/overlay/etc/apache2/ssl/.keep create mode 100644 v7.4/overlay/etc/apache2/templates/base create mode 100644 v7.4/overlay/etc/apache2/templates/ssl create mode 100644 v7.4/overlay/etc/apache2/templates/webdav create mode 100644 v7.4/overlay/etc/ldap/ldap.conf create mode 100644 v7.4/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini create mode 100644 v7.4/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini create mode 100644 v7.4/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini create mode 100644 v7.4/overlay/etc/php/7.4/mods-available/opcache-custom.ini create mode 100644 v7.4/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini create mode 100644 v7.4/overlay/root/.bowerrc create mode 100755 v7.4/overlay/usr/local/bin/apachectl create mode 100644 v7.4/overlay/var/www/owncloud/index.html diff --git a/v7.4/Dockerfile.amd64 b/v7.4/Dockerfile.amd64 new file mode 100644 index 00000000..98b26e4b --- /dev/null +++ b/v7.4/Dockerfile.amd64 @@ -0,0 +1,52 @@ +FROM owncloud/ubuntu:20.04-amd64 + +LABEL maintainer="ownCloud DevOps " \ + org.label-schema.name="ownCloud CI PHP" \ + org.label-schema.vendor="ownCloud GmbH" \ + org.label-schema.schema-version="1.0" + +VOLUME ["/var/www/owncloud"] + +ENV ORACLE_HOME=/usr/lib/oracle/12.2/client64 +ENV LD_LIBRARY_PATH=/usr/lib/oracle/12.2/client64/lib/${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} +ENV APACHE_LOGGING_PATH=/dev/stdout + +ARG RETRY_VERSION + +# renovate: datasource=github-releases depName=owncloud-ci/retry +ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}" + +RUN curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \ + chmod 755 /usr/local/bin/retry + +RUN apt-get update -y && \ + apt-get install -y software-properties-common language-pack-en-base && \ + LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php && \ + LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/apache2 + +RUN apt-get update -y && \ + apt-get upgrade -y && \ + apt-get install -y apache2 libapache2-mod-php7.4 libxml2-utils git-core unzip wget fontconfig libaio1 python2 php7.4 php7.4-dev php7.4-xml php7.4-mbstring php7.4-curl php7.4-gd php7.4-zip php7.4-intl php7.4-sqlite3 php7.4-mysql php7.4-pgsql php7.4-soap php7.4-phpdbg php7.4-ldap php7.4-gmp php7.4-imap php7.4-redis php7.4-memcached php7.4-imagick php7.4-smbclient php7.4-apcu php7.4-apcu-bc php7.4-ast rsync && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /etc/apache2/sites-available/default-ssl.conf && \ + a2enmod rewrite headers env dir mime ssl expires dav dav_fs + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer + +RUN curl -sSo oracle-instantclient12.2-basic_12.2.0.1.0-2_amd64.deb https://minio.owncloud.com/packages/oracle/oracle-instantclient12.2-basic_12.2.0.1.0-2_amd64.deb && \ + dpkg -i oracle-instantclient12.2-basic_12.2.0.1.0-2_amd64.deb && \ + rm oracle-instantclient12.2-basic_12.2.0.1.0-2_amd64.deb + +RUN curl -sSo oracle-instantclient12.2-sqlplus_12.2.0.1.0-2_amd64.deb https://minio.owncloud.com/packages/oracle/oracle-instantclient12.2-sqlplus_12.2.0.1.0-2_amd64.deb && \ + dpkg -i oracle-instantclient12.2-sqlplus_12.2.0.1.0-2_amd64.deb && \ + rm oracle-instantclient12.2-sqlplus_12.2.0.1.0-2_amd64.deb + +RUN curl -sSo oracle-instantclient12.2-devel_12.2.0.1.0-2_amd64.deb https://minio.owncloud.com/packages/oracle/oracle-instantclient12.2-devel_12.2.0.1.0-2_amd64.deb && \ + dpkg -i oracle-instantclient12.2-devel_12.2.0.1.0-2_amd64.deb && \ + rm oracle-instantclient12.2-devel_12.2.0.1.0-2_amd64.deb + +RUN ln -s /usr/include/oracle/12.2/client64 /usr/lib/oracle/12.2/client64/include && \ + echo "instantclient,/usr/lib/oracle/12.2/client64/lib" | pecl install oci8-2.2.0 + +COPY ./overlay ./overlay-amd64 / +WORKDIR /var/www/owncloud diff --git a/v7.4/Dockerfile.arm64v8 b/v7.4/Dockerfile.arm64v8 new file mode 100644 index 00000000..7a9d9c81 --- /dev/null +++ b/v7.4/Dockerfile.arm64v8 @@ -0,0 +1,34 @@ +FROM owncloud/ubuntu:20.04-arm64v8 + +LABEL maintainer="ownCloud DevOps " \ + org.label-schema.name="ownCloud CI PHP" \ + org.label-schema.vendor="ownCloud GmbH" \ + org.label-schema.schema-version="1.0" + +VOLUME ["/var/www/owncloud"] +ENV APACHE_LOGGING_PATH=/dev/stdout + +ARG RETRY_VERSION + +# renovate: datasource=github-releases depName=owncloud-ci/retry +ENV RETRY_VERSION="${RETRY_VERSION:-v2.0.0}" + +RUN curl -SsfL -o /usr/local/bin/retry "https://github.com/owncloud-ci/retry/releases/download/v${RETRY_VERSION##v}/retry" && \ + chmod 755 /usr/local/bin/retry + +RUN apt-get update -y && \ + apt-get install -y software-properties-common language-pack-en-base && \ + LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php && \ + LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/apache2 + +RUN apt-get update -y && \ + apt-get upgrade -y && \ + apt-get install -y apache2 libapache2-mod-php7.4 libxml2-utils git-core unzip wget fontconfig libaio1 python2 php7.4 php7.4-dev php7.4-xml php7.4-mbstring php7.4-curl php7.4-gd php7.4-zip php7.4-intl php7.4-sqlite3 php7.4-mysql php7.4-pgsql php7.4-soap php7.4-phpdbg php7.4-ldap php7.4-gmp php7.4-imap php7.4-redis php7.4-memcached php7.4-imagick php7.4-smbclient php7.4-apcu php7.4-apcu-bc php7.4-ast rsync && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /etc/apache2/sites-available/default-ssl.conf && \ + a2enmod rewrite headers env dir mime ssl expires dav dav_fs + +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer + +COPY ./overlay ./overlay-arm64v8 / +WORKDIR /var/www/owncloud diff --git a/v7.4/manifest.tmpl b/v7.4/manifest.tmpl new file mode 100644 index 00000000..32272403 --- /dev/null +++ b/v7.4/manifest.tmpl @@ -0,0 +1,11 @@ +image: owncloudci/php:7.4 +manifests: + - image: owncloudci/php:7.4-amd64 + platform: + architecture: amd64 + os: linux + - image: owncloudci/php:7.4-arm64v8 + platform: + architecture: arm64 + variant: v8 + os: linux diff --git a/v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini b/v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini new file mode 100644 index 00000000..d3f74189 --- /dev/null +++ b/v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini @@ -0,0 +1 @@ +extension=oci8.so diff --git a/v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini b/v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini new file mode 100644 index 00000000..d3f74189 --- /dev/null +++ b/v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini @@ -0,0 +1 @@ +extension=oci8.so diff --git a/v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini b/v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini new file mode 100644 index 00000000..d3f74189 --- /dev/null +++ b/v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini @@ -0,0 +1 @@ +extension=oci8.so diff --git a/v7.4/overlay-amd64/etc/php/7.4/mods-available/oci8.ini b/v7.4/overlay-amd64/etc/php/7.4/mods-available/oci8.ini new file mode 100644 index 00000000..d3f74189 --- /dev/null +++ b/v7.4/overlay-amd64/etc/php/7.4/mods-available/oci8.ini @@ -0,0 +1 @@ +extension=oci8.so diff --git a/v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini b/v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini new file mode 100644 index 00000000..d3f74189 --- /dev/null +++ b/v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini @@ -0,0 +1 @@ +extension=oci8.so diff --git a/v7.4/overlay-arm64v8/.keep b/v7.4/overlay-arm64v8/.keep new file mode 100644 index 00000000..e69de29b diff --git a/v7.4/overlay/etc/ImageMagick-6/policy.xml b/v7.4/overlay/etc/ImageMagick-6/policy.xml new file mode 100644 index 00000000..77faf966 --- /dev/null +++ b/v7.4/overlay/etc/ImageMagick-6/policy.xml @@ -0,0 +1,69 @@ + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/v7.4/overlay/etc/apache2/conf-enabled/security.conf b/v7.4/overlay/etc/apache2/conf-enabled/security.conf new file mode 100644 index 00000000..498d147c --- /dev/null +++ b/v7.4/overlay/etc/apache2/conf-enabled/security.conf @@ -0,0 +1,3 @@ +ServerTokens Prod +ServerSignature Off +TraceEnable Off diff --git a/v7.4/overlay/etc/apache2/conf-enabled/servername.conf b/v7.4/overlay/etc/apache2/conf-enabled/servername.conf new file mode 100644 index 00000000..873caeb5 --- /dev/null +++ b/v7.4/overlay/etc/apache2/conf-enabled/servername.conf @@ -0,0 +1 @@ +ServerName localhost diff --git a/v7.4/overlay/etc/apache2/sites-enabled/000-default.conf b/v7.4/overlay/etc/apache2/sites-enabled/000-default.conf new file mode 100644 index 00000000..16c20d32 --- /dev/null +++ b/v7.4/overlay/etc/apache2/sites-enabled/000-default.conf @@ -0,0 +1,7 @@ + + ServerAdmin webmaster@localhost + DocumentRoot /var/www/owncloud + + ErrorLog /dev/stdout + CustomLog ${APACHE_LOGGING_PATH} combined + diff --git a/v7.4/overlay/etc/apache2/ssl/.keep b/v7.4/overlay/etc/apache2/ssl/.keep new file mode 100644 index 00000000..e69de29b diff --git a/v7.4/overlay/etc/apache2/templates/base b/v7.4/overlay/etc/apache2/templates/base new file mode 100644 index 00000000..44b162a9 --- /dev/null +++ b/v7.4/overlay/etc/apache2/templates/base @@ -0,0 +1,13 @@ + + ServerAdmin webmaster@localhost + DocumentRoot ${APACHE_WEBROOT} + + ErrorLog /dev/stdout + CustomLog ${APACHE_LOGGING_PATH} combined + + + Options Indexes FollowSymLinks MultiViews + AllowOverride All + Require all granted + + diff --git a/v7.4/overlay/etc/apache2/templates/ssl b/v7.4/overlay/etc/apache2/templates/ssl new file mode 100644 index 00000000..534ec314 --- /dev/null +++ b/v7.4/overlay/etc/apache2/templates/ssl @@ -0,0 +1,19 @@ + + + ServerAdmin webmaster@localhost + DocumentRoot ${APACHE_WEBROOT} + + ErrorLog /dev/stdout + CustomLog ${APACHE_LOGGING_PATH} combined + + + Options Indexes FollowSymLinks MultiViews + AllowOverride All + Require all granted + + + SSLEngine on + SSLCertificateFile ${APACHE_SSL_CERT} + SSLCertificateKeyFile ${APACHE_SSL_KEY} + + diff --git a/v7.4/overlay/etc/apache2/templates/webdav b/v7.4/overlay/etc/apache2/templates/webdav new file mode 100644 index 00000000..630b92e2 --- /dev/null +++ b/v7.4/overlay/etc/apache2/templates/webdav @@ -0,0 +1,25 @@ + + DavLockDB "/tmp/lockdb" + + ErrorLog /dev/stdout + CustomLog ${APACHE_LOGGING_PATH} combined + + ServerAdmin webmaster@localhost + DocumentRoot ${APACHE_WEBROOT} + Alias /webdav ${APACHE_WEBROOT} + + + DAV on + Options +Indexes + AuthType Basic + AuthName "webdav" + AuthUserFile ${APACHE_WEBDAV_AUTHFILE} + Require valid-user + + + + Options Indexes FollowSymLinks + AllowOverride None + Require all granted + + diff --git a/v7.4/overlay/etc/ldap/ldap.conf b/v7.4/overlay/etc/ldap/ldap.conf new file mode 100644 index 00000000..8f83da69 --- /dev/null +++ b/v7.4/overlay/etc/ldap/ldap.conf @@ -0,0 +1 @@ +TLS_REQCERT never diff --git a/v7.4/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini b/v7.4/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini new file mode 100644 index 00000000..81beacc0 --- /dev/null +++ b/v7.4/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=0 diff --git a/v7.4/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini b/v7.4/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini new file mode 100644 index 00000000..81beacc0 --- /dev/null +++ b/v7.4/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=0 diff --git a/v7.4/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini b/v7.4/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini new file mode 100644 index 00000000..81beacc0 --- /dev/null +++ b/v7.4/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=0 diff --git a/v7.4/overlay/etc/php/7.4/mods-available/opcache-custom.ini b/v7.4/overlay/etc/php/7.4/mods-available/opcache-custom.ini new file mode 100644 index 00000000..81beacc0 --- /dev/null +++ b/v7.4/overlay/etc/php/7.4/mods-available/opcache-custom.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=0 diff --git a/v7.4/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini b/v7.4/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini new file mode 100644 index 00000000..81beacc0 --- /dev/null +++ b/v7.4/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=0 diff --git a/v7.4/overlay/root/.bowerrc b/v7.4/overlay/root/.bowerrc new file mode 100644 index 00000000..af8d7847 --- /dev/null +++ b/v7.4/overlay/root/.bowerrc @@ -0,0 +1 @@ +{ "allow_root": true } \ No newline at end of file diff --git a/v7.4/overlay/usr/local/bin/apachectl b/v7.4/overlay/usr/local/bin/apachectl new file mode 100755 index 00000000..b93e3dde --- /dev/null +++ b/v7.4/overlay/usr/local/bin/apachectl @@ -0,0 +1,52 @@ +#!/usr/bin/env bash +set -eo pipefail + +declare -x APACHE_TEMPLATE_PATH +[[ -z "${APACHE_TEMPLATE_PATH}" ]] && APACHE_TEMPLATE_PATH="/etc/apache2/templates" + +declare -x APACHE_CONFIG_TEMPLATE +[[ -z "${APACHE_CONFIG_TEMPLATE}" ]] && APACHE_CONFIG_TEMPLATE="base" + +declare -x APACHE_WEBROOT +[[ -z "${APACHE_WEBROOT}" ]] && APACHE_WEBROOT="/var/www/owncloud" + +declare -x APACHE_SSL_CERT_CN +[[ -z "${APACHE_SSL_CERT_CN}" ]] && APACHE_SSL_CERT_CN="server" + +declare -x APACHE_SSL_CERT +[[ -z "${APACHE_SSL_CERT}" ]] && APACHE_SSL_CERT="/etc/apache2/ssl/${APACHE_SSL_CERT_CN}.crt" + +declare -x APACHE_SSL_KEY +[[ -z "${APACHE_SSL_KEY}" ]] && APACHE_SSL_KEY="/etc/apache2/ssl/${APACHE_SSL_CERT_CN}.key" + +declare -x APACHE_WEBDAV_AUTHFILE +[[ -z "${APACHE_WEBDAV_AUTHFILE}" ]] && APACHE_WEBDAV_AUTHFILE="/etc/apache2/webdav.auth" + +declare -x APACHE_WEBDAV_USERNAME +[[ -z "${APACHE_WEBDAV_USERNAME}" ]] && APACHE_WEBDAV_USERNAME="username" + +declare -x APACHE_WEBDAV_PASSWORD +[[ -z "${APACHE_WEBDAV_PASSWORD}" ]] && APACHE_WEBDAV_PASSWORD="password" + +if [[ ${APACHE_CONFIG_TEMPLATE} == "webdav" ]]; then + echo "Creating authentication file..." + htpasswd -cb "${APACHE_WEBDAV_AUTHFILE}" "${APACHE_WEBDAV_USERNAME}" "${APACHE_WEBDAV_PASSWORD}" + chown www-data:www-data "${APACHE_WEBDAV_AUTHFILE}" + chmod 640 "${APACHE_WEBDAV_AUTHFILE}" + + echo "Fixing directory access..." + chown www-data:www-data "${APACHE_WEBROOT}" +fi + +if [[ ! -f ${APACHE_SSL_KEY} || ! -f ${APACHE_SSL_CERT} ]] +then + echo "Generating certificates for ${APACHE_SSL_CERT_CN}..." + SSL_SUBJ="/C=DE/ST=Bavaria/L=Nuremberg/O=ownCloud GmbH/CN=${APACHE_SSL_CERT_CN}" + openssl req -x509 -subj "${SSL_SUBJ}" -sha256 -nodes -days 1825 -newkey rsa:4096 -keyout ${APACHE_SSL_KEY} -out ${APACHE_SSL_CERT} +fi + +echo "Writing apache config..." +envsubst < ${APACHE_TEMPLATE_PATH}/${APACHE_CONFIG_TEMPLATE} > /etc/apache2/sites-enabled/000-default.conf + +echo "Starting apache... " +exec /usr/sbin/apachectl "$@" diff --git a/v7.4/overlay/var/www/owncloud/index.html b/v7.4/overlay/var/www/owncloud/index.html new file mode 100644 index 00000000..e69de29b