mirror of
https://github.com/nextcloud/docker.git
synced 2024-12-25 02:26:13 +01:00
Use PHP 7.3 for NC 15
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
This commit is contained in:
parent
2994c70264
commit
9ecaf51c4f
6 changed files with 17 additions and 5 deletions
|
@ -1,5 +1,5 @@
|
|||
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
||||
FROM php:7.2-apache-stretch
|
||||
FROM php:7.3-apache-stretch
|
||||
|
||||
# entrypoint.sh and cron.sh dependencies
|
||||
RUN set -ex; \
|
||||
|
@ -34,6 +34,7 @@ RUN set -ex; \
|
|||
libpq-dev \
|
||||
libxml2-dev \
|
||||
libmagickwand-dev \
|
||||
libzip-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
|
||||
FROM php:7.2-fpm-alpine3.8
|
||||
FROM php:7.3-fpm-alpine3.8
|
||||
|
||||
# entrypoint.sh and cron.sh dependencies
|
||||
RUN set -ex; \
|
||||
|
@ -25,6 +25,7 @@ RUN set -ex; \
|
|||
libpng-dev \
|
||||
libmemcached-dev \
|
||||
libxml2-dev \
|
||||
libzip-dev \
|
||||
openldap-dev \
|
||||
pcre-dev \
|
||||
postgresql-dev \
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
# DO NOT EDIT: created by update.sh from Dockerfile-debian.template
|
||||
FROM php:7.2-fpm-stretch
|
||||
FROM php:7.3-fpm-stretch
|
||||
|
||||
# entrypoint.sh and cron.sh dependencies
|
||||
RUN set -ex; \
|
||||
|
@ -34,6 +34,7 @@ RUN set -ex; \
|
|||
libpq-dev \
|
||||
libxml2-dev \
|
||||
libmagickwand-dev \
|
||||
libzip-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
|
|
|
@ -24,6 +24,7 @@ RUN set -ex; \
|
|||
libpng-dev \
|
||||
libmemcached-dev \
|
||||
libxml2-dev \
|
||||
libzip-dev \
|
||||
openldap-dev \
|
||||
pcre-dev \
|
||||
postgresql-dev \
|
||||
|
|
|
@ -33,6 +33,7 @@ RUN set -ex; \
|
|||
libpq-dev \
|
||||
libxml2-dev \
|
||||
libmagickwand-dev \
|
||||
libzip-dev \
|
||||
; \
|
||||
\
|
||||
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
|
||||
|
|
11
update.sh
11
update.sh
|
@ -3,7 +3,7 @@ set -eo pipefail
|
|||
|
||||
declare -A php_version=(
|
||||
[default]='7.2'
|
||||
[12.0]='7.1'
|
||||
[15.0]='7.3'
|
||||
)
|
||||
|
||||
declare -A cmd=(
|
||||
|
@ -58,6 +58,7 @@ travisEnv=
|
|||
|
||||
function create_variant() {
|
||||
dir="$1/$variant"
|
||||
phpVersion=${php_version[$version]-${php_version[default]}}
|
||||
|
||||
# Create the version+variant directory with a Dockerfile.
|
||||
mkdir -p "$dir"
|
||||
|
@ -70,7 +71,7 @@ function create_variant() {
|
|||
|
||||
# Replace the variables.
|
||||
sed -ri -e '
|
||||
s/%%PHP_VERSION%%/'"${php_version[$version]-${php_version[default]}}"'/g;
|
||||
s/%%PHP_VERSION%%/'"$phpVersion"'/g;
|
||||
s/%%VARIANT%%/'"$variant"'/g;
|
||||
s/%%VERSION%%/'"$fullversion"'/g;
|
||||
s/%%BASE_DOWNLOAD_URL%%/'"$2"'/g;
|
||||
|
@ -82,6 +83,12 @@ function create_variant() {
|
|||
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
|
||||
' "$dir/Dockerfile"
|
||||
|
||||
if [[ "$phpVersion" != 7.3 ]]; then
|
||||
sed -ri \
|
||||
-e '/libzip-dev/d' \
|
||||
"$dir/Dockerfile"
|
||||
fi
|
||||
|
||||
# Copy the shell scripts
|
||||
for name in entrypoint cron; do
|
||||
cp "docker-$name.sh" "$dir/$name.sh"
|
||||
|
|
Loading…
Reference in a new issue