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

Update to 23.12.2 and switch to PHP 8.2

This commit is contained in:
Daniel Berteaud 2024-01-24 23:47:00 +01:00
parent 3cec162c96
commit 23d46f69d0
6 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/bookstack.nomad.hcl
View File

@ -37,6 +37,7 @@ job "bookstack" {
} }
} }
sidecar_task { sidecar_task {
resources { resources {
cpu = 50 cpu = 50
memory = 64 memory = 64
@ -62,7 +63,7 @@ job "bookstack" {
driver = "docker" driver = "docker"
config { config {
image = "danielberteaud/bookstack:23.12.1-1" image = "danielberteaud/bookstack:23.12.2-2"
pids_limit = 100 pids_limit = 100
readonly_rootfs = true readonly_rootfs = true
volumes = ["secrets/bookstack.env:/app/.env"] volumes = ["secrets/bookstack.env:/app/.env"]
@ -154,6 +155,7 @@ _EOT
destination = "/data" destination = "/data"
} }
resources { resources {
cpu = 100 cpu = 100
memory = 256 memory = 256

4
example/images/bookstack/Dockerfile
View File

@ -1,7 +1,7 @@
FROM danielberteaud/php:83.24.1-4 FROM danielberteaud/php:82.24.1-5
MAINTAINER Daniel Berteaud <dbd@ehtrace.com> MAINTAINER Daniel Berteaud <dbd@ehtrace.com>
ARG BOOKSTACK_VERSION=23.12.1 ARG BOOKSTACK_VERSION=23.12.2
ENV LANG=fr_FR.utf8 \ ENV LANG=fr_FR.utf8 \
TZ=Europe/Paris \ TZ=Europe/Paris \

2
example/images/bookstack/root/etc/minit.d/bookstack.yml
View File

@ -2,4 +2,4 @@
kind: daemon kind: daemon
name: bookstack-queue name: bookstack-queue
command: ["php", "/app/artisan", "queue:work", "--sleep=3", "--tries=3", "--max-time=3600"] command: ["php", "/app/artisan", "queue:work", "--max-time=86400", "--backoff=10"]

4
images/bookstack/Dockerfile
View File

@ -1,7 +1,7 @@
FROM [[ .docker.repo ]][[ .docker.base_images.php83.image ]] FROM [[ .docker.repo ]][[ .docker.base_images.php82.image ]]
MAINTAINER [[ .docker.maintainer ]] MAINTAINER [[ .docker.maintainer ]]
ARG BOOKSTACK_VERSION=23.12.1 ARG BOOKSTACK_VERSION=[[ .bookstack.version ]]
ENV LANG=[[ .locale.lang ]] \ ENV LANG=[[ .locale.lang ]] \
TZ=[[ .locale.tz ]] \ TZ=[[ .locale.tz ]] \

2
images/bookstack/root/etc/minit.d/bookstack.yml
View File

@ -2,4 +2,4 @@
kind: daemon kind: daemon
name: bookstack-queue name: bookstack-queue
command: ["php", "/app/artisan", "queue:work", "--sleep=3", "--tries=3", "--max-time=3600"] command: ["php", "/app/artisan", "queue:work", "--max-time=86400", "--backoff=10"]

5
variables.yml
View File

@ -5,8 +5,11 @@ instance: bookstack
bookstack: bookstack:
# BookStack version
version: 23.12.2
# Docker image to use # Docker image to use
image: '[[ .docker.repo ]]bookstack:23.12.1-1' image: '[[ .docker.repo ]]bookstack:[[ .bookstack.version ]]-2'
# Number of instances to run # Number of instances to run
count: 1 count: 1