From 1c1bc350dc9be34f90ad66772b6f909b9d12bbf3 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Nov 2024 08:58:24 +1100 Subject: [PATCH 1/2] Rename gh action --- .github/workflows/publish-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-image.yaml b/.github/workflows/publish-image.yaml index 2a0ad05..ce07edc 100644 --- a/.github/workflows/publish-image.yaml +++ b/.github/workflows/publish-image.yaml @@ -1,4 +1,4 @@ -name: Publish Debian and Alpine Container Images +name: Publish Debian Container Images on: push: From e5847a6ff16b588fb8167609814dff32f635190d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 23 Nov 2024 09:43:28 +1100 Subject: [PATCH 2/2] Conditionally build saxon on amd64 --- debian/Dockerfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index 96d7bb8..ef65166 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -95,18 +95,18 @@ COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/www.conf # Configure Saxon WORKDIR /opt -## fetch -RUN curl https://downloads.saxonica.com/SaxonC/HE/12/libsaxon-HEC-linux-x86_64-v${saxon}.zip --output saxon.zip -RUN unzip saxon.zip -d saxon -RUN cp saxon/libsaxon-HEC-linux-amd64-v${saxon}/libs/nix/libsaxon-hec-${saxon}.so /usr/lib/ -WORKDIR /opt/saxon/libsaxon-HEC-linux-amd64-v${saxon}/Saxon.C.API -RUN phpize -RUN ./configure --enable-saxon -RUN make -RUN ls -al -RUN make install -RUN echo 'extension=saxon.so' > "/usr/local/etc/php/conf.d/app.ini" - +RUN if [ "$(dpkg --print-architecture)" = "amd64" ]; then \ + curl https://downloads.saxonica.com/SaxonC/HE/12/libsaxon-HEC-linux-x86_64-v${saxon}.zip --output saxon.zip \ + && unzip saxon.zip -d saxon \ + && cp saxon/libsaxon-HEC-linux-amd64-v${saxon}/libs/nix/libsaxon-hec-${saxon}.so /usr/lib/ \ + && cd /opt/saxon/libsaxon-HEC-linux-amd64-v${saxon}/Saxon.C.API \ + && phpize \ + && ./configure --enable-saxon \ + && make \ + && make install \ + && echo 'extension=saxon.so' > "/usr/local/etc/php/conf.d/app.ini"; \ + fi + # Copy scripts COPY rootfs /