From 9bc48add504dc87fa87717796b2d8ea9a7e97866 Mon Sep 17 00:00:00 2001 From: Michele Locati Date: Sun, 22 Jan 2023 11:33:20 +0100 Subject: [PATCH] Add support for Alpine 3.17 (#687) --- .github/workflows/monitor-php8.2.yml | 1 + .github/workflows/test-extensions.yml | 1 + .github/workflows/test-recent-extensions.yml | 1 + LICENSE | 2 +- install-php-extensions | 5 ++++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/monitor-php8.2.yml b/.github/workflows/monitor-php8.2.yml index 5ad8fee..1cb6c7b 100644 --- a/.github/workflows/monitor-php8.2.yml +++ b/.github/workflows/monitor-php8.2.yml @@ -15,6 +15,7 @@ jobs: distro: - alpine3.15 - alpine3.16 + - alpine3.17 - buster - bullseye name: Check on ${{ matrix.distro }} diff --git a/.github/workflows/test-extensions.yml b/.github/workflows/test-extensions.yml index 5c9ddb2..67d9837 100644 --- a/.github/workflows/test-extensions.yml +++ b/.github/workflows/test-extensions.yml @@ -72,6 +72,7 @@ jobs: - alpine3.14 - alpine3.15 - alpine3.16 + - alpine3.17 - jessie - stretch - buster diff --git a/.github/workflows/test-recent-extensions.yml b/.github/workflows/test-recent-extensions.yml index 12855cc..eb2191f 100644 --- a/.github/workflows/test-recent-extensions.yml +++ b/.github/workflows/test-recent-extensions.yml @@ -47,6 +47,7 @@ jobs: - alpine3.14 - alpine3.15 - alpine3.16 + - alpine3.17 - jessie - stretch - buster diff --git a/LICENSE b/LICENSE index 45bb019..94bb7cf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2020 Michele Locati +Copyright (c) 2018-2023 Michele Locati Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/install-php-extensions b/install-php-extensions index e7489da..5648292 100755 --- a/install-php-extensions +++ b/install-php-extensions @@ -2,7 +2,7 @@ # This script wraps docker-php-ext-install, properly configuring the system. # -# Copyright (c) Michele Locati, 2018-2021 +# Copyright (c) Michele Locati, 2018-2023 # # Source: https://github.com/mlocati/docker-php-extension-installer # @@ -1152,6 +1152,9 @@ buildRequiredPackageLists() { ;; relay@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent lz4-libs zstd-libs" + if test $DISTRO_MAJMIN_VERSION -ge 317; then + buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libssl1.1" + fi ;; simdjson@alpine) buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libstdc++"