Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions bookstack/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_FROM=hassioaddons/base:8.0.6
ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:9.0.1
# hadolint ignore=DL3006
FROM ${BUILD_FROM}

Expand All @@ -9,27 +9,27 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
# hadolint ignore=DL3003
RUN \
apk add --no-cache \
mariadb-client=10.4.15-r0 \
nginx=1.18.0-r1 \
php7-curl=7.3.26-r0 \
php7-dom=7.3.26-r0 \
php7-fileinfo=7.3.26-r0 \
php7-fpm=7.3.26-r0 \
php7-gd=7.3.26-r0 \
php7-json=7.3.26-r0 \
php7-mbstring=7.3.26-r0 \
php7-mysqlnd=7.3.26-r0 \
php7-openssl=7.3.26-r0 \
php7-pdo_mysql=7.3.26-r0 \
php7-session=7.3.26-r0 \
php7-simplexml=7.3.26-r0 \
php7-tidy=7.3.26-r0 \
php7-tokenizer=7.3.26-r0 \
php7-xml=7.3.26-r0 \
php7=7.3.26-r0 \
mariadb-client=10.5.8-r0\
nginx=1.18.0-r13 \
php7-curl=7.4.14-r0 \
php7-dom=7.4.14-r0 \
php7-fileinfo=7.4.14-r0 \
php7-fpm=7.4.14-r0 \
php7-gd=7.4.14-r0 \
php7-json=7.4.14-r0 \
php7-mbstring=7.4.14-r0 \
php7-mysqlnd=7.4.14-r0 \
php7-openssl=7.4.14-r0 \
php7-pdo_mysql=7.4.14-r0 \
php7-session=7.4.14-r0 \
php7-simplexml=7.4.14-r0 \
php7-tidy=7.4.14-r0 \
php7-tokenizer=7.4.14-r0 \
php7-xml=7.4.14-r0 \
php7=7.4.14-r0 \
\
&& apk add --no-cache --virtual .build-dependencies \
composer=1.10.19-r0 \
composer=2.0.8-r0 \
\
&& curl -J -L -o /tmp/bookstack.tar.gz \
https://github.com/BookStackApp/BookStack/archive/v0.31.4.tar.gz \
Expand Down Expand Up @@ -58,20 +58,20 @@ ARG BUILD_VERSION

# Labels
LABEL \
io.hass.name="Bookstack" \
io.hass.description="Bookstack: Simple & Free Wiki Software" \
io.hass.name="${BUILD_NAME}" \
io.hass.description="${BUILD_DESCRIPTION}" \
io.hass.arch="${BUILD_ARCH}" \
io.hass.type="addon" \
io.hass.version=${BUILD_VERSION} \
maintainer="Paul Sinclair <hello@addons.community>" \
org.opencontainers.image.title="Bookstack" \
org.opencontainers.image.description="Bookstack: Simple & Free Wiki Software" \
org.opencontainers.image.title="${BUILD_NAME}" \
org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
org.opencontainers.image.vendor="Home Assistant Community Add-ons" \
org.opencontainers.image.authors="Paul Sinclair <hello@addons.community>" \
org.opencontainers.image.licenses="MIT" \
org.opencontainers.image.url="https://addons.community" \
org.opencontainers.image.source="https://github.com/hassio-addons/addon-bookstack" \
org.opencontainers.image.documentation="https://github.com/hassio-addons/addon-bookstack/blob/master/README.md" \
org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
org.opencontainers.image.created=${BUILD_DATE} \
org.opencontainers.image.revision=${BUILD_REF} \
org.opencontainers.image.version=${BUILD_VERSION}
10 changes: 5 additions & 5 deletions bookstack/build.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"build_from": {
"aarch64": "hassioaddons/base-aarch64:8.0.6",
"amd64": "hassioaddons/base-amd64:8.0.6",
"armhf": "hassioaddons/base-armhf:8.0.6",
"armv7": "hassioaddons/base-armv7:8.0.6",
"i386": "hassioaddons/base-i386:8.0.6"
"aarch64": "ghcr.io/hassio-addons/base/aarch64:9.0.1",
"amd64": "ghcr.io/hassio-addons/base/amd64:9.0.1",
"armhf": "ghcr.io/hassio-addons/base/armhf:9.0.1",
"armv7": "ghcr.io/hassio-addons/base/armv7:9.0.1",
"i386": "ghcr.io/hassio-addons/base/i386:9.0.1"
}
}