public-mirrors
/
docker-php-extension-installer
mirror of https://github.com/mlocati/docker-php-extension-installer
1
0
Fork 0
Code

Avoid apk upgrade (#542) 

Test: zip,xdebug,gd
pull/544/head 1.4.29
Michele Locati 2022-03-25 09:29:15 +01:00 committed by GitHub
parent 7ba4e7a920
commit 65347eb080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
install-php-extensions
View File

@ -498,12 +498,10 @@ buildRequiredPackageLists() {
buildRequiredPackageLists_volatile='' buildRequiredPackageLists_volatile=''
case "$DISTRO" in case "$DISTRO" in
alpine) alpine)
if test $DISTRO_VERSION_NUMBER = '3.14'; then
# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12763#note_172090
apk -U upgrade
else
apk update apk update
fi ;;
debian)
DEBIAN_FRONTEND=noninteractive apt-get update -q
;; ;;
esac esac
case "$DISTRO_VERSION" in case "$DISTRO_VERSION" in
@ -1207,11 +1205,6 @@ buildRequiredPackageLists() {
if test -z "$buildRequiredPackageLists_persistent$buildRequiredPackageLists_volatile"; then if test -z "$buildRequiredPackageLists_persistent$buildRequiredPackageLists_volatile"; then
return return
fi fi
case "$DISTRO" in
debian)
DEBIAN_FRONTEND=noninteractive apt-get update -q
;;
esac
if test -n "$buildRequiredPackageLists_persistent"; then if test -n "$buildRequiredPackageLists_persistent"; then
PACKAGES_PERSISTENT_NEW="$(expandPackagesToBeInstalled $buildRequiredPackageLists_persistent)" PACKAGES_PERSISTENT_NEW="$(expandPackagesToBeInstalled $buildRequiredPackageLists_persistent)"
if test -s "$IPE_ERRFLAG_FILE"; then if test -s "$IPE_ERRFLAG_FILE"; then
@ -1509,7 +1502,14 @@ installRequiredPackages() {
case "$DISTRO" in case "$DISTRO" in
alpine) alpine)
apk add $IPE_APK_FLAGS $PACKAGES_PERSISTENT_NEW $PACKAGES_VOLATILE apk add $IPE_APK_FLAGS $PACKAGES_PERSISTENT_NEW $PACKAGES_VOLATILE
apk upgrade # https://gitlab.alpinelinux.org/alpine/aports/-/issues/12763#note_172090
# https://github.com/mlocati/docker-php-extension-installer/issues/385
# https://github.com/mlocati/docker-php-extension-installer/issues/537#issuecomment-1078748882
for installRequiredPackages_item in wget; do
if test -n "$(expandInstalledSystemPackageName "$installRequiredPackages_item")"; then
apk add --upgrade "$installRequiredPackages_item"
fi
done
;; ;;
debian) debian)
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y $PACKAGES_PERSISTENT_NEW $PACKAGES_VOLATILE DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -qq -y $PACKAGES_PERSISTENT_NEW $PACKAGES_VOLATILE