nextcloud
/
nextcloud-docker
mirror of https://github.com/nextcloud/docker
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #573 from J0WI/php73

Browse Source 
Use PHP 7.3 for NC 15
pull/608/head 13.0.10
J0WI 7 years ago committed by GitHub
parent 57b9193096 46c774cd8c
commit e8e33356ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 50 additions and 26 deletions
Show Stats Download Patch File Download Diff File

5
13.0/apache/Dockerfile
Unescape View File

@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

5
13.0/fpm-alpine/Dockerfile
Unescape View File

@ -20,6 +20,7 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
@ -46,8 +47,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

5
13.0/fpm/Dockerfile
Unescape View File

@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

5
14.0/apache/Dockerfile
Unescape View File

@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

5
14.0/fpm-alpine/Dockerfile
Unescape View File

@ -20,6 +20,7 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
@ -46,8 +47,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

5
14.0/fpm/Dockerfile
Unescape View File

@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
@ -52,8 +53,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

8
15.0/apache/Dockerfile
Unescape View File

@ -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; \
@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
@ -34,6 +35,7 @@ RUN set -ex; \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -52,8 +54,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

8
15.0/fpm-alpine/Dockerfile
Unescape View File

@ -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; \
@ -20,11 +20,13 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
libmemcached-dev \
libxml2-dev \
libzip-dev \
openldap-dev \
pcre-dev \
postgresql-dev \
@ -46,8 +48,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

8
15.0/fpm/Dockerfile
Unescape View File

@ -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; \
@ -24,6 +24,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
@ -34,6 +35,7 @@ RUN set -ex; \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -52,8 +54,8 @@ RUN set -ex; \
; \
\
# pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install APCu-5.1.16; \
pecl install memcached-3.1.3; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\

2
Dockerfile-alpine.template
Unescape View File

@ -19,11 +19,13 @@ RUN set -ex; \
autoconf \
freetype-dev \
icu-dev \
libevent-dev \
libjpeg-turbo-dev \
libmcrypt-dev \
libpng-dev \
libmemcached-dev \
libxml2-dev \
libzip-dev \
openldap-dev \
pcre-dev \
postgresql-dev \

2
Dockerfile-debian.template
Unescape View File

@ -23,6 +23,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
libcurl4-openssl-dev \
libevent-dev \
libfreetype6-dev \
libicu-dev \
libjpeg-dev \
@ -33,6 +34,7 @@ RUN set -ex; \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
libzip-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \

18
update.sh
Unescape View File

@ -2,8 +2,9 @@
set -eo pipefail
declare -A php_version=(
[default]='7.2'
[12.0]='7.1'
[default]='7.3'
[14.0]='7.2'
[13.0]='7.2'
)
declare -A cmd=(
@ -25,8 +26,8 @@ declare -A extras=(
)
declare -A pecl_versions=(
[APCu]='5.1.15'
[memcached]='3.0.4'
[APCu]='5.1.16'
[memcached]='3.1.3'
[redis]='4.2.0'
[imagick]='3.4.3'
)
@ -58,6 +59,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 +72,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 +84,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"

Write Preview
Loading…
Cancel
Save