Skip to content

Commit 12354da

Browse files
authored
⬆ Update image to 9.0.1 and package dependencies (#30)
* 🔨 Update base image to v9.0.1 * 📚 Update image labels * ⬆ Update nginx to 1.18.0-r13 * ⬆ Update mariadb-client to 10.5.8-r0 * ⬆ Update php to 7.4.14-r0 * ⬆ Update composer to 2.0.8-r0
1 parent 1bde058 commit 12354da

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

bookstack/Dockerfile

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

@@ -9,27 +9,27 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
99
# hadolint ignore=DL3003
1010
RUN \
1111
apk add --no-cache \
12-
mariadb-client=10.4.15-r0 \
13-
nginx=1.18.0-r1 \
14-
php7-curl=7.3.26-r0 \
15-
php7-dom=7.3.26-r0 \
16-
php7-fileinfo=7.3.26-r0 \
17-
php7-fpm=7.3.26-r0 \
18-
php7-gd=7.3.26-r0 \
19-
php7-json=7.3.26-r0 \
20-
php7-mbstring=7.3.26-r0 \
21-
php7-mysqlnd=7.3.26-r0 \
22-
php7-openssl=7.3.26-r0 \
23-
php7-pdo_mysql=7.3.26-r0 \
24-
php7-session=7.3.26-r0 \
25-
php7-simplexml=7.3.26-r0 \
26-
php7-tidy=7.3.26-r0 \
27-
php7-tokenizer=7.3.26-r0 \
28-
php7-xml=7.3.26-r0 \
29-
php7=7.3.26-r0 \
12+
mariadb-client=10.5.8-r0\
13+
nginx=1.18.0-r13 \
14+
php7-curl=7.4.14-r0 \
15+
php7-dom=7.4.14-r0 \
16+
php7-fileinfo=7.4.14-r0 \
17+
php7-fpm=7.4.14-r0 \
18+
php7-gd=7.4.14-r0 \
19+
php7-json=7.4.14-r0 \
20+
php7-mbstring=7.4.14-r0 \
21+
php7-mysqlnd=7.4.14-r0 \
22+
php7-openssl=7.4.14-r0 \
23+
php7-pdo_mysql=7.4.14-r0 \
24+
php7-session=7.4.14-r0 \
25+
php7-simplexml=7.4.14-r0 \
26+
php7-tidy=7.4.14-r0 \
27+
php7-tokenizer=7.4.14-r0 \
28+
php7-xml=7.4.14-r0 \
29+
php7=7.4.14-r0 \
3030
\
3131
&& apk add --no-cache --virtual .build-dependencies \
32-
composer=1.10.19-r0 \
32+
composer=2.0.8-r0 \
3333
\
3434
&& curl -J -L -o /tmp/bookstack.tar.gz \
3535
https://github.com/BookStackApp/BookStack/archive/v0.31.4.tar.gz \
@@ -58,20 +58,20 @@ ARG BUILD_VERSION
5858

5959
# Labels
6060
LABEL \
61-
io.hass.name="Bookstack" \
62-
io.hass.description="Bookstack: Simple & Free Wiki Software" \
61+
io.hass.name="${BUILD_NAME}" \
62+
io.hass.description="${BUILD_DESCRIPTION}" \
6363
io.hass.arch="${BUILD_ARCH}" \
6464
io.hass.type="addon" \
6565
io.hass.version=${BUILD_VERSION} \
6666
maintainer="Paul Sinclair <hello@addons.community>" \
67-
org.opencontainers.image.title="Bookstack" \
68-
org.opencontainers.image.description="Bookstack: Simple & Free Wiki Software" \
67+
org.opencontainers.image.title="${BUILD_NAME}" \
68+
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
6969
org.opencontainers.image.vendor="Home Assistant Community Add-ons" \
7070
org.opencontainers.image.authors="Paul Sinclair <hello@addons.community>" \
7171
org.opencontainers.image.licenses="MIT" \
7272
org.opencontainers.image.url="https://addons.community" \
73-
org.opencontainers.image.source="https://github.com/hassio-addons/addon-bookstack" \
74-
org.opencontainers.image.documentation="https://github.com/hassio-addons/addon-bookstack/blob/master/README.md" \
73+
org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
74+
org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
7575
org.opencontainers.image.created=${BUILD_DATE} \
7676
org.opencontainers.image.revision=${BUILD_REF} \
7777
org.opencontainers.image.version=${BUILD_VERSION}

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": "hassioaddons/base-aarch64:8.0.6",
4-
"amd64": "hassioaddons/base-amd64:8.0.6",
5-
"armhf": "hassioaddons/base-armhf:8.0.6",
6-
"armv7": "hassioaddons/base-armv7:8.0.6",
7-
"i386": "hassioaddons/base-i386:8.0.6"
3+
"aarch64": "ghcr.io/hassio-addons/base/aarch64:9.0.1",
4+
"amd64": "ghcr.io/hassio-addons/base/amd64:9.0.1",
5+
"armhf": "ghcr.io/hassio-addons/base/armhf:9.0.1",
6+
"armv7": "ghcr.io/hassio-addons/base/armv7:9.0.1",
7+
"i386": "ghcr.io/hassio-addons/base/i386:9.0.1"
88
}
99
}

0 commit comments

Comments
 (0)