From b978499a7d0ea8d8085e3aa7fbf2fae21b1ca29c Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Mon, 29 Nov 2021 18:06:54 -0500 Subject: [PATCH 1/5] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20base=20image?= =?UTF-8?q?=20to=20v10.2.3?= 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 231b32a..fb402fd 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:10.1.1 +ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:10.2.3 # hadolint ignore=DL3006 FROM ${BUILD_FROM} diff --git a/bookstack/build.json b/bookstack/build.json index a95c1a6..0052b15 100644 --- a/bookstack/build.json +++ b/bookstack/build.json @@ -1,9 +1,9 @@ { "build_from": { - "aarch64": "ghcr.io/hassio-addons/base/aarch64:10.1.1", - "amd64": "ghcr.io/hassio-addons/base/amd64:10.1.1", - "armhf": "ghcr.io/hassio-addons/base/armhf:10.1.1", - "armv7": "ghcr.io/hassio-addons/base/armv7:10.1.1", - "i386": "ghcr.io/hassio-addons/base/i386:10.1.1" + "aarch64": "ghcr.io/hassio-addons/base/aarch64:10.2.3", + "amd64": "ghcr.io/hassio-addons/base/amd64:10.2.3", + "armhf": "ghcr.io/hassio-addons/base/armhf:10.2.3", + "armv7": "ghcr.io/hassio-addons/base/armv7:10.2.3", + "i386": "ghcr.io/hassio-addons/base/i386:10.2.3" } } From 968f72a5c5deed0452bc401dd582ef4950d410cd Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Mon, 29 Nov 2021 18:07:56 -0500 Subject: [PATCH 2/5] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20php=20to=20v7?= =?UTF-8?q?.4.26-r0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookstack/Dockerfile | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/bookstack/Dockerfile b/bookstack/Dockerfile index fb402fd..aa1c2eb 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -9,24 +9,22 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # hadolint ignore=DL3003 RUN \ apk add --no-cache \ - mariadb-client=10.5.12-r0 \ - nginx=1.20.1-r3 \ - php7-curl=7.4.25-r0 \ - php7-dom=7.4.25-r0 \ - php7-fileinfo=7.4.25-r0 \ - php7-fpm=7.4.25-r0 \ - php7-gd=7.4.25-r0 \ - php7-json=7.4.25-r0 \ - php7-ldap=7.4.25-r0 \ - php7-mbstring=7.4.25-r0 \ - php7-mysqlnd=7.4.25-r0 \ - php7-openssl=7.4.25-r0 \ - php7-pdo_mysql=7.4.25-r0 \ - php7-session=7.4.25-r0 \ - php7-simplexml=7.4.25-r0 \ - php7-tokenizer=7.4.25-r0 \ - php7-xml=7.4.25-r0 \ - php7=7.4.25-r0 \ + php7-curl=7.4.26-r0 \ + php7-dom=7.4.26-r0 \ + php7-fileinfo=7.4.26-r0 \ + php7-fpm=7.4.26-r0 \ + php7-gd=7.4.26-r0 \ + php7-json=7.4.26-r0 \ + php7-ldap=7.4.26-r0 \ + php7-mbstring=7.4.26-r0 \ + php7-mysqlnd=7.4.26-r0 \ + php7-openssl=7.4.26-r0 \ + php7-pdo_mysql=7.4.26-r0 \ + php7-session=7.4.26-r0 \ + php7-simplexml=7.4.26-r0 \ + php7-tokenizer=7.4.26-r0 \ + php7-xml=7.4.26-r0 \ + php7=7.4.26-r0 \ \ && apk add --no-cache --virtual .build-dependencies \ composer=2.1.9-r0 \ From e3a785e166fd73eff2991ff0ec1959be873795fe Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Mon, 29 Nov 2021 18:08:34 -0500 Subject: [PATCH 3/5] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20ngnix=20to=20?= =?UTF-8?q?v1.20.2-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 aa1c2eb..918f203 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 \ + nginx=1.20.2-r0 \ php7-curl=7.4.26-r0 \ php7-dom=7.4.26-r0 \ php7-fileinfo=7.4.26-r0 \ From b261b44a8cbdf5c3a4e7c7c5f8ab2e5adf802a8c Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Mon, 29 Nov 2021 18:09:13 -0500 Subject: [PATCH 4/5] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20mariadb-clien?= =?UTF-8?q?t=20to=20v10.5.13-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 918f203..3caf57a 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.13-r0 \ nginx=1.20.2-r0 \ php7-curl=7.4.26-r0 \ php7-dom=7.4.26-r0 \ From 7cff56f4e6614ba99a670c3e352a5e5ae4222a75 Mon Sep 17 00:00:00 2001 From: Paul Sinclair Date: Mon, 29 Nov 2021 18:09:56 -0500 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=94=A8=20Remove=20verbose=20logging?= 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 3caf57a..db13287 100644 --- a/bookstack/Dockerfile +++ b/bookstack/Dockerfile @@ -34,7 +34,7 @@ RUN \ && curl -J -L -o /tmp/bookstack.tar.gz \ https://github.com/BookStackApp/BookStack/archive/v21.10.3.tar.gz \ && mkdir -p /var/www/bookstack \ - && tar zxvf /tmp/bookstack.tar.gz -C \ + && tar zxf /tmp/bookstack.tar.gz -C \ /var/www/bookstack --strip-components=1 \ && cd /var/www/bookstack \ \