danog/docker-php-extension-installer
1
0
Fork 0
mirror of https://github.com/danog/docker-php-extension-installer.git synced 2024-11-26 20:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix stretch apt archive (#737)

Browse Source
This commit is contained in:
Michele Locati 2023-04-27 10:40:50 +02:00 committed by GitHub
parent 5d18994cf3
commit 7655337ec9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test-extensions.yml vendored
View File

@ -98,7 +98,7 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- run: docker run --rm --volume "$(pwd):/app" --workdir /app php:7.3-stretch ./scripts/test-restore-apt - run: docker run --rm --volume "$(pwd):/app" --workdir /app php:8.2-bullseye ./scripts/test-restore-apt
test_custom_version: test_custom_version:
name: Test installing specific versions name: Test installing specific versions
needs: needs:

9
install-php-extensions
View File

@ -3925,7 +3925,12 @@ invokeAptGetUpdate() {
return return
fi fi
IPE_APTGET_INSTALLOPTIONS='' IPE_APTGET_INSTALLOPTIONS=''
if ! grep -q 'VERSION="8 (jessie)"' /etc/os-release; then invokeAptGetUpdate_fixdistro=''
if grep -q 'VERSION="8 (jessie)"' /etc/os-release; then
invokeAptGetUpdate_fixdistro=jessie
elif grep -q 'VERSION="9 (stretch)"' /etc/os-release; then
invokeAptGetUpdate_fixdistro=stretch
else
IPE_APTGETUPDATE_ALREADY=y IPE_APTGETUPDATE_ALREADY=y
DEBIAN_FRONTEND=noninteractive apt-get update -q DEBIAN_FRONTEND=noninteractive apt-get update -q
return return
@ -3937,7 +3942,7 @@ invokeAptGetUpdate() {
if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then if test -z "${IPE_DEB_ARCHIVE_SECURITY:-}"; then
IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security IPE_DEB_ARCHIVE_SECURITY=http://archive.kernel.org/debian-archive/debian-security
fi fi
sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+jessie-updates\b.*);#\1;" /etc/apt/sources.list sed -ri "s;^(\s*deb\s+http://(httpredir|deb).debian.org/debian\s+$invokeAptGetUpdate_fixdistro-updates\b.*);#\1;" /etc/apt/sources.list
sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list sed -ri "s;^(\s*deb\s+)http://(httpredir|deb).debian.org;\1$IPE_DEB_ARCHIVE;" /etc/apt/sources.list
sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list sed -ri "s;^(\s*deb\s+)http://security.debian.org/debian-security;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list
sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list sed -ri "s;^(\s*deb\s+)http://security.debian.org;\1$IPE_DEB_ARCHIVE_SECURITY;" /etc/apt/sources.list