diff --git a/Dockerfile b/Dockerfile index 6b2a25f..6dfaaa5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,8 +44,16 @@ RUN \ tar xf \ /tmp/bookstack.tar.gz -C \ /app/www/ --strip-components=1 && \ - echo "**** install composer dependencies ****" && \ - composer install -d /app/www/ && \ + echo "**** install php dependencies ****" && \ + curl -o \ + /tmp/bookstack-vendor.zip -L \ + "https://files.bookstackapp.com/vendor/${BOOKSTACK_RELEASE}.zip" && \ + if [ "$(sha256sum /tmp/bookstack-vendor.zip | awk -F ' ' '{print $1}')" == "$(cat /app/www/dev/checksums/vendor)" ]; then \ + unzip -d /app/www/ /tmp/bookstack-vendor.zip; \ + else \ + echo "Vendor zip checksum did not match, falling back to composer."; \ + composer install -d /app/www/ --no-dev; \ + fi && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** create symlinks ****" && \ /bin/bash -c \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2623dce..fb0cfbb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -44,8 +44,16 @@ RUN \ tar xf \ /tmp/bookstack.tar.gz -C \ /app/www/ --strip-components=1 && \ - echo "**** install composer dependencies ****" && \ - composer install -d /app/www/ && \ + echo "**** install php dependencies ****" && \ + curl -o \ + /tmp/bookstack-vendor.zip -L \ + "https://files.bookstackapp.com/vendor/${BOOKSTACK_RELEASE}.zip" && \ + if [ "$(sha256sum /tmp/bookstack-vendor.zip | awk -F ' ' '{print $1}')" == "$(cat /app/www/dev/checksums/vendor)" ]; then \ + unzip -d /app/www/ /tmp/bookstack-vendor.zip; \ + else \ + echo "Vendor zip checksum did not match, falling back to composer."; \ + composer install -d /app/www/ --no-dev; \ + fi && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** create symlinks ****" && \ /bin/bash -c \ diff --git a/README.md b/README.md index 419259d..29abaeb 100644 --- a/README.md +++ b/README.md @@ -343,6 +343,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **28.10.26:** - Use vendor zip from upstream instead of composer for php deps, with fallback to composer if it fails. * **05.08.26:** - Run the async queue worker as the PUID/PGID-managed abc user. * **05.07.26:** - Rebase to Alpine 3.24. * **29.04.26:** - Switch to pulling releases from [Codeberg](https://codeberg.org/bookstack/bookstack). diff --git a/readme-vars.yml b/readme-vars.yml index b248ebd..0b87509 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -136,6 +136,7 @@ init_diagram: | "bookstack:latest" <- Base Images # changelog changelogs: + - {date: "28.10.26:", desc: "Use vendor zip from upstream instead of composer for php deps, with fallback to composer if it fails."} - {date: "05.08.26:", desc: "Run the async queue worker as the PUID/PGID-managed abc user."} - {date: "05.07.26:", desc: "Rebase to Alpine 3.24."} - {date: "29.04.26:", desc: "Switch to pulling releases from [Codeberg](https://codeberg.org/bookstack/bookstack)."}