Skip to content

Added support for the BookStack System CLI #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 9, 2023
Merged

Added support for the BookStack System CLI #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
607fecb
Added requirements for bookstack-system-cli
ssddanbrown May 6, 2023
ba204db
Updated changelog and readme mapping for system-cli changes
ssddanbrown May 8, 2023
e79965f
Updated additional dockerfiles with cli support
ssddanbrown May 8, 2023
5911614
Updated changelog date for cli support
ssddanbrown May 23, 2023
eb7bd9a
Rebase against current master branch
thespad Jun 7, 2023
122d120
Merge branch 'master' into system-cli-support
thespad Jun 7, 2023
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
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/`
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 2 additions & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/`
Expand All @@ -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." }
Expand Down
3 changes: 2 additions & 1 deletion root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down