summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--13.0/apache/Dockerfile5
-rw-r--r--13.0/fpm-alpine/Dockerfile5
-rw-r--r--13.0/fpm/Dockerfile5
-rw-r--r--14.0/apache/Dockerfile5
-rw-r--r--14.0/fpm-alpine/Dockerfile5
-rw-r--r--14.0/fpm/Dockerfile5
-rw-r--r--15.0/apache/Dockerfile8
-rw-r--r--15.0/fpm-alpine/Dockerfile8
-rw-r--r--15.0/fpm/Dockerfile8
-rw-r--r--Dockerfile-alpine.template2
-rw-r--r--Dockerfile-debian.template2
-rwxr-xr-xupdate.sh18
12 files changed, 50 insertions, 26 deletions
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index 3b3ef9e9..d36104af 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -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; \
\
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 7461ea09..98bc406b 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -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; \
\
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 3ea4481e..22f343d8 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -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; \
\
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index 5533e2f6..b0bf50c0 100644
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@@ -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; \
\
diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile
index 66aec993..95cae19e 100644
--- a/14.0/fpm-alpine/Dockerfile
+++ b/14.0/fpm-alpine/Dockerfile
@@ -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; \
\
diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile
index d7b0edb2..7e7cff2c 100644
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@@ -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; \
\
diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile
index 7c50375d..5fad6022 100644
--- a/15.0/apache/Dockerfile
+++ b/15.0/apache/Dockerfile
@@ -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; \
\
diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile
index f71d5f9e..cdc04ec2 100644
--- a/15.0/fpm-alpine/Dockerfile
+++ b/15.0/fpm-alpine/Dockerfile
@@ -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; \
\
diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile
index c8dc904f..59877ab2 100644
--- a/15.0/fpm/Dockerfile
+++ b/15.0/fpm/Dockerfile
@@ -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; \
\
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
index 4d282f54..6b92d863 100644
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@@ -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 \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
index d10ae367..c4c01814 100644
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@@ -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)"; \
diff --git a/update.sh b/update.sh
index 8a323635..31dd6182 100755
--- a/update.sh
+++ b/update.sh
@@ -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"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-29 19:15:20 +0000