Skip to content

Commit

Permalink
Merge pull request #23 from mlocati/master
Browse files Browse the repository at this point in the history 
Fork Sync: Update from parent repository
  • Loading branch information
@vanderletenpartners
vanderletenpartners authored Sep 1, 2024
2 parents dd9c1ae + ac4b767 commit dd9e353
Show file tree
Hide file tree
Showing 11 changed files with 243 additions and 67 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/test-dockerfile.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,16 @@ jobs:
run: docker save --output /tmp/image.tar test:latest
-
name: Extract layer
run: tar -C /tmp -x -f /tmp/image.tar --wildcards '*layer.tar' --strip-components=1
run: |
tar -C /tmp -x -f /tmp/image.tar --strip-components=1
if [ ! -d /tmp/sha256 ]; then
echo 'Cannot extract docker archive.'
exit 1
fi
-
name: Check layer contents
run: |
ENTRY="$(tar -v -t -f /tmp/layer.tar --wildcards '*bin/install-php-extensions')"
ENTRY="$(find /tmp/sha256 -type f -exec tar -vtf {} \; 2>/dev/null | grep install-php-extensions)"
if [ -z "$ENTRY" ]; then
echo 'File not found'
exit 1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-extensions.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: "1.21.0"
go-version: ">=1.22.6"
cache: false
- name: Install shfmt
run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@v3.7.0
run: GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@v3.9.0
- name: Checkout
uses: actions/checkout@v4
- name: Check coding style
Expand Down
11 changes: 3 additions & 8 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM bash AS build

COPY install-php-extensions /tmp/install-php-extensions
RUN chmod +x /tmp/install-php-extensions

FROM scratch

LABEL org.opencontainers.image.source="https://github.com/mlocati/docker-php-extension-installer" \
org.opencontainers.image.licenses="MIT"
LABEL org.opencontainers.image.source="https://github.com/mlocati/docker-php-extension-installer"
LABEL org.opencontainers.image.licenses="MIT"

COPY --from=build /tmp/install-php-extensions /usr/bin/install-php-extensions
COPY --chmod=755 install-php-extensions /usr/bin/install-php-extensions
15 changes: 8 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ install-php-extensions @fix_letsencrypt
| odbc | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| opcache | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| opencensus | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | |
| openswoole | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
| openswoole | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
| opentelemetry | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | |
| parallel[*](#special-requirements-for-parallel) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
| parle[*](#special-requirements-for-parle) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | |
Expand All @@ -282,9 +282,10 @@ install-php-extensions @fix_letsencrypt
| pdo_oci | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | |
| pdo_odbc | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| pdo_pgsql | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| pdo_sqlsrv[*](#special-requirements-for-pdo_sqlsrv) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | |
| pdo_sqlsrv | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | |
| pgsql | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| php_trie | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | |
| phpy[*](#special-requirements-for-phpy) | ✓ | ✓ | ✓ | ✓ | | | | | | | | |
| pkcs11 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | |
| pq | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | |
| propro | | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
Expand Down Expand Up @@ -314,7 +315,7 @@ install-php-extensions @fix_letsencrypt
| sqlsrv[*](#special-requirements-for-sqlsrv) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | |
| ssh2 | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| stomp | ✓ | ✓ | ✓ | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| swoole | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| swoole | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| sybase_ct | | | | | | | | | | | ✓ | ✓ |
| sync | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| sysvmsg | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
Expand All @@ -324,7 +325,7 @@ install-php-extensions @fix_letsencrypt
| tideways | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| tidy | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| timezonedb | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uopz | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uopz | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uploadprogress | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uuid | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| uv | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | | |
Expand All @@ -348,7 +349,7 @@ install-php-extensions @fix_letsencrypt
| zookeeper | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
| zstd | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |

*Number of supported extensions: 146*
*Number of supported extensions: 147*
<!-- END OF EXTENSIONS TABLE -->

PS: the pre-installed PHP extensions are excluded from this list.
Expand Down Expand Up @@ -446,12 +447,12 @@ Some extensions have special requirements:
| <a name="special-requirements-for-memprof"></a>memprof | &bull; Not available in `alpine3.9` docker images<br />&bull; Not available in `alpine3.10` docker images<br />&bull; Not available in `alpine3.11` docker images<br />&bull; Not available in `alpine3.12` docker images<br />&bull; Not available in `alpine3.13` docker images<br />&bull; Not available in `alpine3.14` docker images<br />&bull; Not available in `alpine3.15` docker images |
| <a name="special-requirements-for-parallel"></a>parallel | Requires images with PHP compiled with thread-safety enabled (`zts`) |
| <a name="special-requirements-for-parle"></a>parle | Not available in `jessie` docker images |
| <a name="special-requirements-for-pdo_sqlsrv"></a>pdo_sqlsrv | Not available in ARM architectures |
| <a name="special-requirements-for-phpy"></a>phpy | Not available in `buster` docker images |
| <a name="special-requirements-for-pthreads"></a>pthreads | Requires images with PHP compiled with thread-safety enabled (`zts`) |
| <a name="special-requirements-for-saxon"></a>saxon | Not available in `alpine` docker images |
| <a name="special-requirements-for-simdjson"></a>simdjson | &bull; Not available in `jessie` docker images<br />&bull; Not available in `stretch` docker images |
| <a name="special-requirements-for-sodium"></a>sodium | Not available in `jessie` docker images |
| <a name="special-requirements-for-sqlsrv"></a>sqlsrv | &bull; Not available in `7.1-alpine3.9` docker images<br />&bull; Not available in `7.1-alpine3.10` docker images<br />&bull; Not available in ARM architectures |
| <a name="special-requirements-for-sqlsrv"></a>sqlsrv | &bull; Not available in `7.1-alpine3.9` docker images<br />&bull; Not available in `7.1-alpine3.10` docker images |
| <a name="special-requirements-for-vips"></a>vips | &bull; Not available in `alpine3.9` docker images<br />&bull; Not available in `jessie` docker images |
| <a name="special-requirements-for-wikidiff2"></a>wikidiff2 | &bull; Not available in `jessie` docker images<br />&bull; Not available in `stretch` docker images |
<!-- END OF SPECIAL REQUIREMENTS -->
Expand Down
4 changes: 2 additions & 2 deletions data/special-requirements
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ lz4 !jessie
memprof !alpine3.9 !alpine3.10 !alpine3.11 !alpine3.12 !alpine3.13 !alpine3.14 !alpine3.15
parallel zts
parle !jessie
pdo_sqlsrv !arm
phpy !buster
pthreads zts
saxon !alpine
simdjson !jessie !stretch
sodium !jessie
sqlsrv !7.1-alpine3.9 !7.1-alpine3.10 !arm
sqlsrv !7.1-alpine3.9 !7.1-alpine3.10
vips !alpine3.9 !jessie
wikidiff2 !jessie !stretch
7 changes: 4 additions & 3 deletions data/supported-extensions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ oci8 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
odbc 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
opcache 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
opencensus 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3
openswoole 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
openswoole 7.2 7.3 7.4 8.0 8.1 8.2 8.3
opentelemetry 8.0 8.1 8.2 8.3 8.4
parallel 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
parle 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
Expand All @@ -82,6 +82,7 @@ pdo_pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
pdo_sqlsrv 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
php_trie 7.3 7.4 8.0 8.1 8.2 8.3 8.4
phpy 8.1 8.2 8.3 8.4
pkcs11 7.4 8.0 8.1 8.2 8.3 8.4
pq 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
propro 5.5 5.6 7.0 7.1 7.2 7.3 7.4
Expand Down Expand Up @@ -111,7 +112,7 @@ spx 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3
sqlsrv 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
ssh2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
stomp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.2 8.3 8.4
swoole 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
swoole 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3
sybase_ct 5.5 5.6
sync 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
sysvmsg 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
Expand All @@ -121,7 +122,7 @@ tensor 7.2 7.3 7.4 8.0 8.1 8.2
tideways 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3
tidy 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
timezonedb 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
uopz 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
uopz 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3
uploadprogress 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
uuid 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2 8.3 8.4
uv 8.0 8.1 8.2 8.3 8.4
Expand Down
Loading

0 comments on commit dd9e353

Please sign in to comment.