nomad/bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 24.05

Browse Source
This commit is contained in:
Daniel Berteaud 2024-05-12 22:21:25 +02:00
parent 8899dcf28f
commit e0894c2605
7 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bookstack.nomad.hcl
View File

@ -34,10 +34,6 @@ job "[[ .instance ]]" {
[[ template "common/tmpfs" dict "size" "5000000" "target" "/tmp" ]]
}
env {
[[ template "common/proxy_env" $c ]]
}
[[ template "common/vault.policies" $c ]]
[[ template "common/file_env" $c ]]

9
example/bookstack.nomad.hcl
View File

@ -84,7 +84,7 @@ job "bookstack" {
driver = "docker"
config {
image = "danielberteaud/bookstack:24.02.3-1"
image = "danielberteaud/bookstack:24.05-1"
pids_limit = 100
readonly_rootfs = true
volumes = ["secrets/bookstack.env:/app/.env"]
@ -98,11 +98,6 @@ job "bookstack" {
}
env {
}
vault {
policies = ["bookstack"]
@ -156,6 +151,7 @@ DB_PASSWORD={{ with secret "database/creds/bookstack" }}{{ .Data.password }}{{ e
DB_PORT=3306
DB_USERNAME={{ with secret "database/creds/bookstack" }}{{ .Data.username }}{{ end }}
DISABLE_EXTERNAL_SERVICES=true
EXPORT_PDF_COMMAND="/usr/local/bin/wkhtmltopdf {input_html_path} {output_pdf_path}"
MAIL_DRIVER=smtp
MAIL_FROM=no-reply@bookstack.example.org
MAIL_FROM_NAME=bookstack
@ -166,7 +162,6 @@ SESSION_COOKIE_NAME=bookstack_session
SESSION_DRIVER=database
SESSION_LIFETIME=240
STORAGE_TYPE=local_secure_restricted
WKHTMLTOPDF=/usr/local/bin/wkhtmltopdf
_EOT
destination = "secrets/bookstack.env"
uid = 100100

4
example/images/bookstack/Dockerfile
View File

@ -1,13 +1,13 @@
FROM danielberteaud/php:82.24.5-1
MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG BOOKSTACK_VERSION=24.02.3
ARG BOOKSTACK_VERSION=24.05
ENV LANG=fr_FR.utf8 \
TZ=Europe/Paris \
APP_ROOT=/app/public \
BOOKSTACK_INIT_DB=true \
WKHTMLTOPDF=/usr/local/bin/wkhtmltopdf \
EXPORT_PDF_COMMAND="/usr/local/bin/wkhtmltopdf {input_html_path} {output_pdf_path}" \
APP_ENV=production \
APP_TIMEZONE='Europe/Paris' \
SESSION_SECURE_COOKIE=true

4
example/images/bookstack/root/entrypoint.d/30-app.sh
View File

@ -8,10 +8,14 @@ if [ "${BOOKSTACK_INIT_DB}" = "true" ]; then
php /app/artisan migrate --force
cat /app/version > /data/version
elif [ "$(cat /app/version)" != "$(cat /data/version)" ]; then
echo "Manually cleanup bootstrap cache"
rm -rf /data/app/cache/*
echo "Upgrade from $(cat /data/version) to $(cat /app/version)"
php /app/artisan migrate --force
echo "Clearing cache"
php /app/artisan cache:clear
echo "Clearing config cache"
php /app/artisan config:clear
echo "Clearing views"
php /app/artisan view:clear
echo "Regenerating search"

2
images/bookstack/Dockerfile
View File

@ -7,7 +7,7 @@ ENV LANG=[[ .locale.lang ]] \
TZ=[[ .locale.tz ]] \
APP_ROOT=/app/public \
BOOKSTACK_INIT_DB=true \
WKHTMLTOPDF=/usr/local/bin/wkhtmltopdf \
EXPORT_PDF_COMMAND="/usr/local/bin/wkhtmltopdf {input_html_path} {output_pdf_path}" \
APP_ENV=production \
APP_TIMEZONE='[[ .locale.tz ]]' \
SESSION_SECURE_COOKIE=true

4
images/bookstack/root/entrypoint.d/30-app.sh
View File

@ -8,10 +8,14 @@ if [ "${BOOKSTACK_INIT_DB}" = "true" ]; then
php /app/artisan migrate --force
cat /app/version > /data/version
elif [ "$(cat /app/version)" != "$(cat /data/version)" ]; then
echo "Manually cleanup bootstrap cache"
rm -rf /data/app/cache/*
echo "Upgrade from $(cat /data/version) to $(cat /app/version)"
php /app/artisan migrate --force
echo "Clearing cache"
php /app/artisan cache:clear
echo "Clearing config cache"
php /app/artisan config:clear
echo "Clearing views"
php /app/artisan view:clear
echo "Regenerating search"

5
variables.yml
View File

@ -6,7 +6,7 @@ instance: bookstack
bookstack:
# BookStack version
version: 24.02.3
version: 24.05
# Docker image to use
image: '[[ .docker.repo ]]bookstack:[[ .bookstack.version ]]-1'
@ -72,7 +72,8 @@ bookstack:
QUEUE_CONNECTION: database
STORAGE_TYPE: local_secure_restricted
DISABLE_EXTERNAL_SERVICES: true
WKHTMLTOPDF: /usr/local/bin/wkhtmltopdf
#WKHTMLTOPDF: /usr/local/bin/wkhtmltopdf
EXPORT_PDF_COMMAND: '"/usr/local/bin/wkhtmltopdf {input_html_path} {output_pdf_path}"'
# Database settings
mysql: