Add support for Debian 12 (bookworm) and Alpine 3.18 (#765)

pull/759/head
Michele Locati 2023-06-23 15:46:51 +02:00 committed by GitHub
parent 18e614d695
commit f9683d077d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 4 deletions

View File

@ -16,8 +16,10 @@ jobs:
- alpine3.15
- alpine3.16
- alpine3.17
- alpine3.18
- buster
- bullseye
- bookworm
name: Check on ${{ matrix.distro }}
runs-on: ubuntu-latest
env:

View File

@ -71,10 +71,12 @@ jobs:
- alpine3.15
- alpine3.16
- alpine3.17
- alpine3.18
- jessie
- stretch
- buster
- bullseye
- bookworm
name: Check on ${{ matrix.distro }}
runs-on: ubuntu-latest
env:

View File

@ -46,10 +46,12 @@ jobs:
- alpine3.15
- alpine3.16
- alpine3.17
- alpine3.18
- jessie
- stretch
- buster
- bullseye
- bookworm
name: Check on ${{ matrix.distro }}
env:
IPETEST_DOCKER_DISTRO: ${{ matrix.distro }}

View File

@ -1,7 +1,9 @@
cassandra !jessie !stretch !buster !bullseye
cassandra !jessie !stretch !buster !bullseye !bookworm
ddtrace !jessie
decimal !bookworm
geos !alpine3.9 !alpine3.10
lz4 !jessie
memcached !bookworm
memprof !alpine3.9 !alpine3.10 !alpine3.11 !alpine3.12 !alpine3.13 !alpine3.14 !alpine3.15
parallel zts
parle !jessie

View File

@ -1968,12 +1968,18 @@ installMicrosoftSqlServerODBC() {
rm -rf /tmp/src/msodbcsql.apk
;;
debian)
if test $DISTRO_VERSION_NUMBER -eq 12; then
DISTRO_VERSION_NUMBER=11
fi
# https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server#debian17
printf -- '- installing the Microsoft APT key\n'
if test $DISTRO_VERSION_NUMBER -ge 11; then
# apt-key is deprecated
if test $DISTRO_VERSION_NUMBER -eq 11; then
curl -sSLf -o /etc/apt/trusted.gpg.d/microsoft.asc https://packages.microsoft.com/keys/microsoft.asc
elif test $DISTRO_VERSION_NUMBER -ge 12; then
curl https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor --yes --output /usr/share/keyrings/microsoft-prod.gpg
else
# apt-key is deprecated
curl -sSLf https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
fi
if ! test -f /etc/apt/sources.list.d/mssql-release.list; then
@ -1984,12 +1990,16 @@ installMicrosoftSqlServerODBC() {
printf -- '- installing the APT package\n'
if test $PHP_MAJMIN_VERSION -le 703; then
DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -qqy --no-install-recommends $IPE_APTGET_INSTALLOPTIONS msodbcsql17
elif test $DISTRO_VERSION_NUMBER -ge 9 && $DISTRO_VERSION_NUMBER -le 11; then
elif test $DISTRO_VERSION_NUMBER -ge 9 && test $DISTRO_VERSION_NUMBER -le 11; then
# On Debian 9 and 11 we have both msodbcsql17 and msodbcsql18: let's install just one
DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -qqy --no-install-recommends $IPE_APTGET_INSTALLOPTIONS msodbcsql18
else
DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y apt-get install -qqy --no-install-recommends $IPE_APTGET_INSTALLOPTIONS '^msodbcsql[0-9]+$'
fi
if test $DISTRO_VERSION_NUMBER -eq 11; then
setDistro
fi
;;
esac
}