octoleo/docker-joomla
2
3
Fork 0
mirror of https://github.com/octoleo/docker-joomla.git synced 2024-11-18 01:35:09 +00:00
Code Issues Releases Activity

Merge pull request #71 from J0WI/rotate-php73

Browse Source 
Replace PHP 7.0 by PHP 7.3
This commit is contained in:
Michael Babker 2018-12-24 08:24:30 -06:00 committed by GitHub
commit fc73e6a1fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -5,15 +5,15 @@ env:
- VARIANT=php5.6/apache - VARIANT=php5.6/apache
- VARIANT=php5.6/fpm - VARIANT=php5.6/fpm
- VARIANT=php5.6/fpm-alpine - VARIANT=php5.6/fpm-alpine
- VARIANT=php7.0/apache
- VARIANT=php7.0/fpm
- VARIANT=php7.0/fpm-alpine
- VARIANT=php7.1/apache - VARIANT=php7.1/apache
- VARIANT=php7.1/fpm - VARIANT=php7.1/fpm
- VARIANT=php7.1/fpm-alpine - VARIANT=php7.1/fpm-alpine
- VARIANT=php7.2/apache - VARIANT=php7.2/apache
- VARIANT=php7.2/fpm - VARIANT=php7.2/fpm
- VARIANT=php7.2/fpm-alpine - VARIANT=php7.2/fpm-alpine
- VARIANT=php7.3/apache
- VARIANT=php7.3/fpm
- VARIANT=php7.3/fpm-alpine
install: install:
- git clone https://github.com/docker-library/official-images.git ~/official-images - git clone https://github.com/docker-library/official-images.git ~/official-images

1
Dockerfile-alpine.template
View File

@ -19,6 +19,7 @@ RUN set -ex; \
libmcrypt-dev \ libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libzip-dev \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \

1
Dockerfile-debian.template
View File

@ -18,6 +18,7 @@ RUN set -ex; \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \

4
php7.1/apache/Dockerfile
View File

@ -39,8 +39,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

4
php7.1/fpm-alpine/Dockerfile
View File

@ -39,8 +39,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

4
php7.1/fpm/Dockerfile
View File

@ -36,8 +36,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

4
php7.2/apache/Dockerfile
View File

@ -37,8 +37,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

4
php7.2/fpm-alpine/Dockerfile
View File

@ -37,8 +37,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

4
php7.2/fpm/Dockerfile
View File

@ -34,8 +34,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

9
php7.0/apache/Dockerfile → php7.3/apache/Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:7.0-apache FROM php:7.3-apache
LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)" LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
# Disable remote database security requirements. # Disable remote database security requirements.
@ -17,10 +17,10 @@ RUN set -ex; \
libbz2-dev \ libbz2-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -30,7 +30,6 @@ RUN set -ex; \
bz2 \ bz2 \
gd \ gd \
ldap \ ldap \
mcrypt \
mysqli \ mysqli \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
@ -39,8 +38,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

0
php7.0/apache/docker-entrypoint.sh → php7.3/apache/docker-entrypoint.sh
View File

0
php7.0/apache/makedb.php → php7.3/apache/makedb.php
View File

9
php7.0/fpm-alpine/Dockerfile → php7.3/fpm-alpine/Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:7.0-fpm-alpine FROM php:7.3-fpm-alpine
LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)" LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
# Disable remote database security requirements. # Disable remote database security requirements.
@ -16,9 +16,9 @@ RUN set -ex; \
autoconf \ autoconf \
bzip2-dev \ bzip2-dev \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libzip-dev \
openldap-dev \ openldap-dev \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
@ -30,7 +30,6 @@ RUN set -ex; \
bz2 \ bz2 \
gd \ gd \
ldap \ ldap \
mcrypt \
mysqli \ mysqli \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
@ -39,8 +38,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

0
php7.0/fpm-alpine/docker-entrypoint.sh → php7.3/fpm-alpine/docker-entrypoint.sh
View File

0
php7.0/fpm-alpine/makedb.php → php7.3/fpm-alpine/makedb.php
View File

9
php7.0/fpm/Dockerfile → php7.3/fpm/Dockerfile
View File

@ -1,4 +1,4 @@
FROM php:7.0-fpm FROM php:7.3-fpm
LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)" LABEL maintainer="Michael Babker <michael.babker@joomla.org> (@mbabker)"
# Disable remote database security requirements. # Disable remote database security requirements.
@ -14,10 +14,10 @@ RUN set -ex; \
libbz2-dev \ libbz2-dev \
libjpeg-dev \ libjpeg-dev \
libldap2-dev \ libldap2-dev \
libmcrypt-dev \
libmemcached-dev \ libmemcached-dev \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libzip-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \ docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -27,7 +27,6 @@ RUN set -ex; \
bz2 \ bz2 \
gd \ gd \
ldap \ ldap \
mcrypt \
mysqli \ mysqli \
pdo_mysql \ pdo_mysql \
pdo_pgsql \ pdo_pgsql \
@ -36,8 +35,8 @@ RUN set -ex; \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.13; \ pecl install APCu-5.1.16; \
pecl install memcached-3.0.4; \ pecl install memcached-3.1.2; \
pecl install redis-4.2.0; \ pecl install redis-4.2.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \

0
php7.0/fpm/docker-entrypoint.sh → php7.3/fpm/docker-entrypoint.sh
View File

0
php7.0/fpm/makedb.php → php7.3/fpm/makedb.php
View File

13
update.sh
View File

@ -32,8 +32,8 @@ declare -A pecl_versions=(
[php5-APCu]='4.0.11' [php5-APCu]='4.0.11'
[php5-memcached]='2.2.0' [php5-memcached]='2.2.0'
[php5-redis]='4.2.0' [php5-redis]='4.2.0'
[php7-APCu]='5.1.13' [php7-APCu]='5.1.16'
[php7-memcached]='3.0.4' [php7-memcached]='3.1.2'
[php7-redis]='4.2.0' [php7-redis]='4.2.0'
) )
@ -71,12 +71,19 @@ for phpVersion in "${phpVersions[@]}"; do
cp -a "$entrypoint" "$dir/docker-entrypoint.sh" cp -a "$entrypoint" "$dir/docker-entrypoint.sh"
cp -a "makedb.php" "$dir/makedb.php" cp -a "makedb.php" "$dir/makedb.php"
if [ $phpVersionDir = "php7.2" ]; then if [ $phpVersionDir = "php7.2" -o $phpVersionDir = "php7.3" ]; then
sed \ sed \
-e '/libmcrypt-dev/d' \ -e '/libmcrypt-dev/d' \
-e '/mcrypt/d' \ -e '/mcrypt/d' \
-i $dir/Dockerfile -i $dir/Dockerfile
fi fi
if [[ "$phpVersion" != 7.3 ]]; then
sed -ri \
-e '/libzip-dev/d' \
"$dir/Dockerfile"
fi
) )
travisEnv+='\n - VARIANT='"$dir" travisEnv+='\n - VARIANT='"$dir"