diff --git a/Dockerfile b/Dockerfile index c90d704..7ef3d58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,13 +9,14 @@ ARG BOOKSTACK_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="homerr" -# package versions +# package versions ARG BOOKSTACK_RELEASE RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ fontconfig \ + mariadb-client \ memcached \ php82-dom \ php82-gd \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 38c010c..f93873c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,13 +9,14 @@ ARG BOOKSTACK_RELEASE LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="homerr" -# package versions +# package versions ARG BOOKSTACK_RELEASE RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ fontconfig \ + mariadb-client \ memcached \ php82-dom \ php82-gd \ diff --git a/README.md b/README.md index 8c53fa0..ecd4344 100644 --- a/README.md +++ b/README.md @@ -81,6 +81,7 @@ Below is a mapping of container `/config` paths to those relative within a BookS - **/config container path** => **BookStack relative path** - `/config/www/.env` => `.env` - `/config/www/laravel.log` => `storage/logs/laravel.log` +- `/config/www/backups/` => `storage/backups/` - `/config/www/files/` => `storage/uploads/files/` - `/config/www/images/` => `storage/uploads/images/` - `/config/www/themes/` => `themes/` @@ -290,6 +291,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **07.06.23:** - Add mariadb-client for bookstack-system-cli support. * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf. * **13.04.23:** - Move ssl.conf include to default.conf. * **01.03.23:** - Add php iconv. diff --git a/readme-vars.yml b/readme-vars.yml index e940c80..13a67dc 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -98,6 +98,7 @@ app_setup_block: | - **/config container path** => **BookStack relative path** - `/config/www/.env` => `.env` - `/config/www/laravel.log` => `storage/logs/laravel.log` + - `/config/www/backups/` => `storage/backups/` - `/config/www/files/` => `storage/uploads/files/` - `/config/www/images/` => `storage/uploads/images/` - `/config/www/themes/` => `themes/` @@ -116,6 +117,7 @@ app_setup_block: | # changelog changelogs: + - { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - { date: "01.03.23:", desc: "Add php iconv." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run index a4da96b..1b683e6 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run @@ -3,7 +3,7 @@ # create directory structure mkdir -p \ - /config/www/{uploads,files,images,themes} + /config/www/{uploads,files,images,themes,backups} # check for .env and copy default if needed if [[ ! -f "/config/www/.env" ]] || [[ ! -s "/config/www/.env" ]]; then @@ -13,6 +13,7 @@ fi # create symlinks symlinks=( /app/www/themes + /app/www/storage/backups /app/www/storage/uploads/files /app/www/storage/uploads/images /app/www/public/uploads