From c375230d9636bd3f2ff4318565783db859268fb7 Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Wed, 20 Jan 2021 12:39:19 -0500 Subject: [PATCH 1/6] =?UTF-8?q?=F0=9F=94=A8=20Update=20base=20image=20to?= =?UTF-8?q?=20v9.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookstack/Dockerfile | 2 +- bookstack/build.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index f67f9a1..107fce4 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -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} diff --git a/bookstack/build.json b/bookstack/build.json index 56b0309..8b6d940 100644 --- a/bookstack/build.json +++ b/bookstack/build.json @@ -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" } } From c817cb3ec38498148539c70c46a7c1952055468b Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Wed, 20 Jan 2021 12:39:43 -0500 Subject: [PATCH 2/6] =?UTF-8?q?=F0=9F=93=9A=20Update=20image=20labels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookstack/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index 107fce4..3995185 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -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 " \ - 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 " \ 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} From c7855b41578fc005bc13cf28e292f5de0350ff51 Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Wed, 20 Jan 2021 12:40:15 -0500 Subject: [PATCH 3/6] =?UTF-8?q?=E2=AC=86=20Update=20nginx=20to=201.18.0-r1?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookstack/Dockerfile | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index 3995185..1940ed1 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -9,24 +9,7 @@ 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 \ + nginx=1.18.0-r13 \ \ && apk add --no-cache --virtual .build-dependencies \ composer=1.10.19-r0 \ From 907c299a51bf1e330e78fc7441c30cebd0f65e1f Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Wed, 20 Jan 2021 12:40:42 -0500 Subject: [PATCH 4/6] =?UTF-8?q?=E2=AC=86=20Update=20mariadb-client=20to=20?= =?UTF-8?q?10.5.8-r0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookstack/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index 1940ed1..8a599d5 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -9,6 +9,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3003 RUN \ apk add --no-cache \ + mariadb-client=10.5.8-r0\ nginx=1.18.0-r13 \ \ && apk add --no-cache --virtual .build-dependencies \ From 4aaee47e8a38bed0784e98ddf997ae4df20821ca Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Wed, 20 Jan 2021 12:41:06 -0500 Subject: [PATCH 5/6] =?UTF-8?q?=E2=AC=86=20Update=20php=20to=207.4.14-r0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookstack/Dockerfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index 8a599d5..3a01aef 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -11,6 +11,22 @@ RUN \ apk add --no-cache \ 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 \ From a877a3d52dfd4874a30e4f0492d9fcd9f08577c2 Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Wed, 20 Jan 2021 12:41:29 -0500 Subject: [PATCH 6/6] =?UTF-8?q?=E2=AC=86=20Update=20composer=20to=202.0.8-?= =?UTF-8?q?r0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookstack/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index 3a01aef..38d938a 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -29,7 +29,7 @@ RUN \ 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 \