Skip to content

Reorganize 7.4 #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phil-davis merged 2 commits into from
Oct 12, 2022
Merged

Reorganize 7.4 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
759e45b
Rename v7.4 to v7.4-ubuntu18.04
phil-davis Oct 12, 2022
20a88bb
Copy v7.4-ubuntu20.04 to v7.4
phil-davis Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions v7.4-ubuntu18.04/Dockerfile.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
FROM owncloud/ubuntu:18.04-amd64

LABEL maintainer="ownCloud DevOps <devops@owncloud.com>" \
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 python 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
34 changes: 34 additions & 0 deletions v7.4-ubuntu18.04/Dockerfile.arm64v8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
FROM owncloud/ubuntu:18.04-arm64v8

LABEL maintainer="ownCloud DevOps <devops@owncloud.com>" \
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

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

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 upgrade -y && \
apt-get install -y apache2 libapache2-mod-php7.4 libxml2-utils git-core unzip wget fontconfig libaio1 python 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
11 changes: 11 additions & 0 deletions v7.4-ubuntu18.04/manifest.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
image: owncloudci/php:7.4-ubuntu18.04
manifests:
- image: owncloudci/php:7.4-ubuntu18.04-amd64
platform:
architecture: amd64
os: linux
- image: owncloudci/php:7.4-ubuntu18.04-arm64v8
platform:
architecture: arm64
variant: v8
os: linux
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../mods-available/oci8.ini
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../mods-available/oci8.ini
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../mods-available/oci8.ini
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/mods-available/oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extension=oci8.so
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../mods-available/oci8.ini
Empty file added v7.4-ubuntu18.04/overlay-arm64v8/.keep
View file
Open in desktop
Empty file.
69 changes: 69 additions & 0 deletions v7.4-ubuntu18.04/overlay/etc/ImageMagick-6/policy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE policymap [
<!ELEMENT policymap (policy)+>
<!ELEMENT policy (#PCDATA)>
<!ATTLIST policy domain (delegate|coder|filter|path|resource) #IMPLIED>
<!ATTLIST policy name CDATA #IMPLIED>
<!ATTLIST policy rights CDATA #IMPLIED>
<!ATTLIST policy pattern CDATA #IMPLIED>
<!ATTLIST policy value CDATA #IMPLIED>
]>
<!--
Configure ImageMagick policies.

Domains include system, delegate, coder, filter, path, or resource.

Rights include none, read, write, and execute. Use | to combine them,
for example: "read | write" to permit read from, or write to, a path.

Use a glob expression as a pattern.

Suppose we do not want users to process MPEG video images:

<policy domain="delegate" rights="none" pattern="mpeg:decode" />

Here we do not want users reading images from HTTP:

<policy domain="coder" rights="none" pattern="HTTP" />

Lets prevent users from executing any image filters:

<policy domain="filter" rights="none" pattern="*" />

The /repository file system is restricted to read only. We use a glob
expression to match all paths that start with /repository:

<policy domain="path" rights="read" pattern="/repository/*" />

Any large image is cached to disk rather than memory:

<policy domain="resource" name="area" value="1GB"/>

Define arguments for the memory, map, area, and disk resources with
SI prefixes (.e.g 100MB). In addition, resource policies are maximums for
each instance of ImageMagick (e.g. policy memory limit 1GB, -limit 2GB
exceeds policy maximum so memory limit is 1GB).
-->
<policymap>
<!-- <policy domain="resource" name="temporary-path" value="/tmp"/> -->
<!-- <policy domain="resource" name="memory" value="2GiB"/> -->
<!-- <policy domain="resource" name="map" value="4GiB"/> -->
<!-- <policy domain="resource" name="area" value="1GB"/> -->
<!-- <policy domain="resource" name="disk" value="16EB"/> -->
<!-- <policy domain="resource" name="file" value="768"/> -->
<!-- <policy domain="resource" name="thread" value="4"/> -->
<!-- <policy domain="resource" name="throttle" value="0"/> -->
<!-- <policy domain="resource" name="time" value="3600"/> -->
<!-- <policy domain="system" name="precision" value="6"/> -->
<policy domain="cache" name="shared-secret" value="passphrase"/>
<policy domain="coder" rights="none" pattern="EPHEMERAL" />
<policy domain="coder" rights="none" pattern="URL" />
<policy domain="coder" rights="none" pattern="HTTPS" />
<policy domain="coder" rights="none" pattern="MVG" />
<policy domain="coder" rights="none" pattern="MSL" />
<policy domain="coder" rights="none" pattern="TEXT" />
<policy domain="coder" rights="none" pattern="SHOW" />
<policy domain="coder" rights="none" pattern="WIN" />
<policy domain="coder" rights="none" pattern="PLT" />
<policy domain="path" rights="none" pattern="@*" />
</policymap>
3 changes: 3 additions & 0 deletions v7.4-ubuntu18.04/overlay/etc/apache2/conf-enabled/security.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ServerTokens Prod
ServerSignature Off
TraceEnable Off
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/etc/apache2/conf-enabled/servername.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ServerName localhost
7 changes: 7 additions & 0 deletions v7.4-ubuntu18.04/overlay/etc/apache2/sites-enabled/000-default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot /var/www/owncloud

ErrorLog /dev/stdout
CustomLog ${APACHE_LOGGING_PATH} combined
</VirtualHost>
Empty file added v7.4-ubuntu18.04/overlay/etc/apache2/ssl/.keep
View file
Open in desktop
Empty file.
13 changes: 13 additions & 0 deletions v7.4-ubuntu18.04/overlay/etc/apache2/templates/base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<VirtualHost *:80>
ServerAdmin webmaster@localhost
DocumentRoot ${APACHE_WEBROOT}

ErrorLog /dev/stdout
CustomLog ${APACHE_LOGGING_PATH} combined

<Directory ${APACHE_WEBROOT}>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Require all granted
</Directory>
</VirtualHost>
19 changes: 19 additions & 0 deletions v7.4-ubuntu18.04/overlay/etc/apache2/templates/ssl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerAdmin webmaster@localhost
DocumentRoot ${APACHE_WEBROOT}

ErrorLog /dev/stdout
CustomLog ${APACHE_LOGGING_PATH} combined

<Directory ${APACHE_WEBROOT}>
Options Indexes FollowSymLinks MultiViews
AllowOverride All
Require all granted
</Directory>

SSLEngine on
SSLCertificateFile ${APACHE_SSL_CERT}
SSLCertificateKeyFile ${APACHE_SSL_KEY}
</VirtualHost>
</IfModule>
25 changes: 25 additions & 0 deletions v7.4-ubuntu18.04/overlay/etc/apache2/templates/webdav
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<VirtualHost *:80>
DavLockDB "/tmp/lockdb"

ErrorLog /dev/stdout
CustomLog ${APACHE_LOGGING_PATH} combined

ServerAdmin webmaster@localhost
DocumentRoot ${APACHE_WEBROOT}
Alias /webdav ${APACHE_WEBROOT}

<Location /webdav/>
DAV on
Options +Indexes
AuthType Basic
AuthName "webdav"
AuthUserFile ${APACHE_WEBDAV_AUTHFILE}
Require valid-user
</Location>

<Directory ${APACHE_WEBROOT} >
Options Indexes FollowSymLinks
AllowOverride None
Require all granted
</Directory>
</VirtualHost>
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/etc/ldap/ldap.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TLS_REQCERT never
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/etc/php/7.4/apache2/conf.d/10-opcache-custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
opcache.revalidate_freq=0
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/etc/php/7.4/cli/conf.d/10-opcache-custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
opcache.revalidate_freq=0
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/etc/php/7.4/fpm/conf.d/10-opcache-custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
opcache.revalidate_freq=0
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/etc/php/7.4/mods-available/opcache-custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
opcache.revalidate_freq=0
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/etc/php/7.4/phpdbg/conf.d/10-opcache-custom.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
opcache.revalidate_freq=0
1 change: 1 addition & 0 deletions v7.4-ubuntu18.04/overlay/root/.bowerrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "allow_root": true }
52 changes: 52 additions & 0 deletions v7.4-ubuntu18.04/overlay/usr/local/bin/apachectl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "$@"
Empty file added v7.4-ubuntu18.04/overlay/var/www/owncloud/index.html
View file
Open in desktop
Empty file.
4 changes: 2 additions & 2 deletions v7.4/Dockerfile.amd64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM owncloud/ubuntu:18.04-amd64
FROM owncloud/ubuntu:20.04-amd64

LABEL maintainer="ownCloud DevOps <devops@owncloud.com>" \
org.label-schema.name="ownCloud CI PHP" \
Expand Down Expand Up @@ -26,7 +26,7 @@ RUN apt-get update -y && \

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 python 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 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
Expand Down
14 changes: 7 additions & 7 deletions v7.4/Dockerfile.arm64v8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM owncloud/ubuntu:18.04-arm64v8
FROM owncloud/ubuntu:20.04-arm64v8

LABEL maintainer="ownCloud DevOps <devops@owncloud.com>" \
org.label-schema.name="ownCloud CI PHP" \
Expand All @@ -8,11 +8,6 @@ LABEL maintainer="ownCloud DevOps <devops@owncloud.com>" \
VOLUME ["/var/www/owncloud"]
ENV APACHE_LOGGING_PATH=/dev/stdout

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

ARG RETRY_VERSION

# renovate: datasource=github-releases depName=owncloud-ci/retry
Expand All @@ -21,9 +16,14 @@ 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 python 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 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
Expand Down
1 change: 0 additions & 1 deletion v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions v7.4/overlay-amd64/etc/php/7.4/apache2/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extension=oci8.so
1 change: 0 additions & 1 deletion v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions v7.4/overlay-amd64/etc/php/7.4/cli/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extension=oci8.so
1 change: 0 additions & 1 deletion v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions v7.4/overlay-amd64/etc/php/7.4/fpm/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extension=oci8.so
1 change: 0 additions & 1 deletion v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions v7.4/overlay-amd64/etc/php/7.4/phpdbg/conf.d/20-oci8.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
extension=oci8.so