From 23d46f69d041514315e8f8256a1b021a99333ba9 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 24 Jan 2024 23:47:00 +0100 Subject: [PATCH] Update to 23.12.2 and switch to PHP 8.2 --- example/bookstack.nomad.hcl | 4 +++- example/images/bookstack/Dockerfile | 4 ++-- example/images/bookstack/root/etc/minit.d/bookstack.yml | 2 +- images/bookstack/Dockerfile | 4 ++-- images/bookstack/root/etc/minit.d/bookstack.yml | 2 +- variables.yml | 5 ++++- 6 files changed, 13 insertions(+), 8 deletions(-) diff --git a/example/bookstack.nomad.hcl b/example/bookstack.nomad.hcl index fdeb007..76b6400 100644 --- a/example/bookstack.nomad.hcl +++ b/example/bookstack.nomad.hcl @@ -37,6 +37,7 @@ job "bookstack" { } } sidecar_task { + resources { cpu = 50 memory = 64 @@ -62,7 +63,7 @@ job "bookstack" { driver = "docker" config { - image = "danielberteaud/bookstack:23.12.1-1" + image = "danielberteaud/bookstack:23.12.2-2" pids_limit = 100 readonly_rootfs = true volumes = ["secrets/bookstack.env:/app/.env"] @@ -154,6 +155,7 @@ _EOT destination = "/data" } + resources { cpu = 100 memory = 256 diff --git a/example/images/bookstack/Dockerfile b/example/images/bookstack/Dockerfile index 58823b9..b07c6f5 100644 --- a/example/images/bookstack/Dockerfile +++ b/example/images/bookstack/Dockerfile @@ -1,7 +1,7 @@ -FROM danielberteaud/php:83.24.1-4 +FROM danielberteaud/php:82.24.1-5 MAINTAINER Daniel Berteaud -ARG BOOKSTACK_VERSION=23.12.1 +ARG BOOKSTACK_VERSION=23.12.2 ENV LANG=fr_FR.utf8 \ TZ=Europe/Paris \ diff --git a/example/images/bookstack/root/etc/minit.d/bookstack.yml b/example/images/bookstack/root/etc/minit.d/bookstack.yml index 60d21f9..0dbf5ed 100644 --- a/example/images/bookstack/root/etc/minit.d/bookstack.yml +++ b/example/images/bookstack/root/etc/minit.d/bookstack.yml @@ -2,4 +2,4 @@ kind: daemon 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"] diff --git a/images/bookstack/Dockerfile b/images/bookstack/Dockerfile index bc45365..d335ca9 100644 --- a/images/bookstack/Dockerfile +++ b/images/bookstack/Dockerfile @@ -1,7 +1,7 @@ -FROM [[ .docker.repo ]][[ .docker.base_images.php83.image ]] +FROM [[ .docker.repo ]][[ .docker.base_images.php82.image ]] MAINTAINER [[ .docker.maintainer ]] -ARG BOOKSTACK_VERSION=23.12.1 +ARG BOOKSTACK_VERSION=[[ .bookstack.version ]] ENV LANG=[[ .locale.lang ]] \ TZ=[[ .locale.tz ]] \ diff --git a/images/bookstack/root/etc/minit.d/bookstack.yml b/images/bookstack/root/etc/minit.d/bookstack.yml index 60d21f9..0dbf5ed 100644 --- a/images/bookstack/root/etc/minit.d/bookstack.yml +++ b/images/bookstack/root/etc/minit.d/bookstack.yml @@ -2,4 +2,4 @@ kind: daemon 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"] diff --git a/variables.yml b/variables.yml index aad4889..bd9822e 100644 --- a/variables.yml +++ b/variables.yml @@ -5,8 +5,11 @@ instance: bookstack bookstack: + # BookStack version + version: 23.12.2 + # Docker image to use - image: '[[ .docker.repo ]]bookstack:23.12.1-1' + image: '[[ .docker.repo ]]bookstack:[[ .bookstack.version ]]-2' # Number of instances to run count: 1