Skip to content

Commit 97ac55f

Browse files
authored
⬆️ Update image, PHP and dependencies (#178)
* ⬆️ Update image to v11.1.2 * ⬆️ Update PHP to 8.0.18-r0 * ⬆️ Update Composer to 2.2.12-r0 * ⬆️ Update mariadb/nginx
1 parent 9902583 commit 97ac55f

File tree

5 files changed

+26
-27
lines changed

5 files changed

+26
-27
lines changed

bookstack/Dockerfile

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:10.2.3
1+
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:11.1.2
22
# hadolint ignore=DL3006
33
FROM ${BUILD_FROM}
44

@@ -9,27 +9,26 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
99
# hadolint ignore=DL3003
1010
RUN \
1111
apk add --no-cache \
12-
mariadb-client=10.5.15-r0 \
12+
mariadb-client=10.6.7-r0 \
1313
nginx=1.20.2-r1 \
14-
php7-curl=7.4.26-r0 \
15-
php7-dom=7.4.26-r0 \
16-
php7-fileinfo=7.4.26-r0 \
17-
php7-fpm=7.4.26-r0 \
18-
php7-gd=7.4.26-r0 \
19-
php7-json=7.4.26-r0 \
20-
php7-ldap=7.4.26-r0 \
21-
php7-mbstring=7.4.26-r0 \
22-
php7-mysqlnd=7.4.26-r0 \
23-
php7-openssl=7.4.26-r0 \
24-
php7-pdo_mysql=7.4.26-r0 \
25-
php7-session=7.4.26-r0 \
26-
php7-simplexml=7.4.26-r0 \
27-
php7-tokenizer=7.4.26-r0 \
28-
php7-xml=7.4.26-r0 \
29-
php7=7.4.26-r0 \
14+
php8-curl=8.0.18-r0 \
15+
php8-dom=8.0.18-r0 \
16+
php8-fileinfo=8.0.18-r0 \
17+
php8-fpm=8.0.18-r0 \
18+
php8-gd=8.0.18-r0 \
19+
php8-ldap=8.0.18-r0 \
20+
php8-mbstring=8.0.18-r0 \
21+
php8-mysqlnd=8.0.18-r0 \
22+
php8-openssl=8.0.18-r0 \
23+
php8-pdo_mysql=8.0.18-r0 \
24+
php8-session=8.0.18-r0 \
25+
php8-simplexml=8.0.18-r0 \
26+
php8-tokenizer=8.0.18-r0 \
27+
php8-xml=8.0.18-r0 \
28+
php8=8.0.18-r0 \
3029
\
3130
&& apk add --no-cache --virtual .build-dependencies \
32-
composer=2.1.9-r0 \
31+
composer=2.2.12-r0 \
3332
\
3433
&& curl -J -L -o /tmp/bookstack.tar.gz \
3534
https://github.com/BookStackApp/BookStack/archive/v22.04.tar.gz \

bookstack/build.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"build_from": {
3-
"aarch64": "ghcr.io/hassio-addons/base/aarch64:10.2.3",
4-
"amd64": "ghcr.io/hassio-addons/base/amd64:10.2.3",
5-
"armhf": "ghcr.io/hassio-addons/base/armhf:10.2.3",
6-
"armv7": "ghcr.io/hassio-addons/base/armv7:10.2.3",
7-
"i386": "ghcr.io/hassio-addons/base/i386:10.2.3"
3+
"aarch64": "ghcr.io/hassio-addons/base/aarch64:11.1.2",
4+
"amd64": "ghcr.io/hassio-addons/base/amd64:11.1.2",
5+
"armhf": "ghcr.io/hassio-addons/base/armhf:11.1.2",
6+
"armv7": "ghcr.io/hassio-addons/base/armv7:11.1.2",
7+
"i386": "ghcr.io/hassio-addons/base/i386:11.1.2"
88
}
99
}

bookstack/rootfs/etc/cont-init.d/bookstack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ ln -s /data/bookstack/uploads /var/www/bookstack/public/uploads
8181
# Create API key if needed
8282
if ! bashio::fs.file_exists "/data/bookstack/appkey.txt"; then
8383
bashio::log.info "Generating app key"
84-
key=$(php /var/www/bookstack/artisan key:generate --show)
84+
key=$(php8 /var/www/bookstack/artisan key:generate --show)
8585
echo "${key}" > /data/bookstack/appkey.txt
8686
bashio::log.info "App Key generated: ${key}"
8787
fi

bookstack/rootfs/etc/services.d/php-fpm/run

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ if bashio::config.equals 'log_level' 'debug' \
4646
fi
4747

4848
bashio::log.info "Installing/updating Database"
49-
php /var/www/bookstack/artisan migrate --force
49+
php8 /var/www/bookstack/artisan migrate --force
5050

5151
bashio::log.info "Starting PHP-FPM..."
5252

53-
exec php-fpm7 --nodaemonize
53+
exec php-fpm8 --nodaemonize

0 commit comments

Comments
 (0)