Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
12 changes: 10 additions & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)."}
Expand Down
Loading