danog/php
1
0
Fork 0
mirror of https://github.com/danog/php.git synced 2024-11-30 04:29:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ordering, adjust generate-stackbrew-library.sh

Browse Source
This commit is contained in:
Tianon Gravi 2019-12-23 09:53:03 -08:00
parent 622b2415c6
commit d147df1014
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -6,12 +6,12 @@ env:
- VERSION=7.4 VARIANT=buster/apache
- VERSION=7.4 VARIANT=buster/fpm
- VERSION=7.4 VARIANT=buster/zts
- VERSION=7.4 VARIANT=alpine3.10/cli
- VERSION=7.4 VARIANT=alpine3.10/fpm
- VERSION=7.4 VARIANT=alpine3.10/zts
- VERSION=7.4 VARIANT=alpine3.11/cli
- VERSION=7.4 VARIANT=alpine3.11/fpm
- VERSION=7.4 VARIANT=alpine3.11/zts
- VERSION=7.4 VARIANT=alpine3.10/cli
- VERSION=7.4 VARIANT=alpine3.10/fpm
- VERSION=7.4 VARIANT=alpine3.10/zts
- VERSION=7.3 VARIANT=buster/cli
- VERSION=7.3 VARIANT=buster/apache
- VERSION=7.3 VARIANT=buster/fpm
@ -20,12 +20,12 @@ env:
- VERSION=7.3 VARIANT=stretch/apache
- VERSION=7.3 VARIANT=stretch/fpm
- VERSION=7.3 VARIANT=stretch/zts
- VERSION=7.3 VARIANT=alpine3.10/cli
- VERSION=7.3 VARIANT=alpine3.10/fpm
- VERSION=7.3 VARIANT=alpine3.10/zts
- VERSION=7.3 VARIANT=alpine3.11/cli
- VERSION=7.3 VARIANT=alpine3.11/fpm
- VERSION=7.3 VARIANT=alpine3.11/zts
- VERSION=7.3 VARIANT=alpine3.10/cli
- VERSION=7.3 VARIANT=alpine3.10/fpm
- VERSION=7.3 VARIANT=alpine3.10/zts
- VERSION=7.2 VARIANT=buster/cli
- VERSION=7.2 VARIANT=buster/apache
- VERSION=7.2 VARIANT=buster/fpm
@ -34,12 +34,12 @@ env:
- VERSION=7.2 VARIANT=stretch/apache
- VERSION=7.2 VARIANT=stretch/fpm
- VERSION=7.2 VARIANT=stretch/zts
- VERSION=7.2 VARIANT=alpine3.10/cli
- VERSION=7.2 VARIANT=alpine3.10/fpm
- VERSION=7.2 VARIANT=alpine3.10/zts
- VERSION=7.2 VARIANT=alpine3.11/cli
- VERSION=7.2 VARIANT=alpine3.11/fpm
- VERSION=7.2 VARIANT=alpine3.11/zts
- VERSION=7.2 VARIANT=alpine3.10/cli
- VERSION=7.2 VARIANT=alpine3.10/fpm
- VERSION=7.2 VARIANT=alpine3.10/zts
install:
- git clone https://github.com/docker-library/official-images.git ~/official-images

4
generate-stackbrew-library.sh
View File

@ -10,7 +10,7 @@ defaultDebianSuite='buster'
declare -A debianSuites=(
#[7.4-rc]='buster'
)
defaultAlpineVersion='3.10'
defaultAlpineVersion='3.11'
declare -A alpineVersions=(
# /usr/src/php/ext/openssl/openssl.c:551:12: error: static declaration of 'RSA_set0_key' follows non-static declaration
# https://github.com/docker-library/php/pull/702#issuecomment-413341743
@ -89,7 +89,7 @@ for version in "${versions[@]}"; do
# order here controls the order of the library/ file
for suite in \
buster stretch \
alpine{3.10,3.9} \
alpine{3.11,3.10} \
; do
for variant in \
cli \

2
update.sh
View File

@ -116,7 +116,7 @@ for version in "${versions[@]}"; do
dockerfiles=()
for suite in buster stretch alpine{3.10,3.11}; do
for suite in buster stretch alpine{3.11,3.10}; do
[ -d "$version/$suite" ] || continue
alpineVer="${suite#alpine}"