From aea7bac941fb36abf8288031b5b0f5fd9522d6d9 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 18 Jan 2021 15:05:27 +0100 Subject: [PATCH 1/4] test --- nextcloud/Dockerfile | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 683c40765..480510619 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -8,24 +8,6 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Set shell SHELL ["/bin/bash", "-o", "pipefail", "-c"] -# Add bashio -RUN apk add --no-cache \ - curl \ - jq \ - && curl -J -L -o /tmp/bashio.tar.gz \ - "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ - && mkdir /tmp/bashio \ - && tar zxvf \ - /tmp/bashio.tar.gz \ - --strip 1 -C /tmp/bashio \ - \ - && mv /tmp/bashio/lib /usr/lib/bashio \ - && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ - && rm -fr \ - /tmp/* \ - /var/{cache,log}/* \ - /var/lib/apt/lists/* - # modify/copy files RUN sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \ && sed -i "s|config|data/config|g" /etc/cont-init.d/* \ From ccc5fe19230d7efd73bd015cc68c2896462a2c6b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 18 Jan 2021 15:06:39 +0100 Subject: [PATCH 2/4] Update 51-install_options --- nextcloud/root/etc/cont-init.d/51-install_options | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nextcloud/root/etc/cont-init.d/51-install_options b/nextcloud/root/etc/cont-init.d/51-install_options index 498a8f5f6..768354767 100644 --- a/nextcloud/root/etc/cont-init.d/51-install_options +++ b/nextcloud/root/etc/cont-init.d/51-install_options @@ -3,7 +3,7 @@ declare CONFIG declare OCR_LANG -CONFIG=$( Date: Mon, 18 Jan 2021 15:14:52 +0100 Subject: [PATCH 3/4] Add bashio --- nextcloud/Dockerfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nextcloud/Dockerfile b/nextcloud/Dockerfile index 480510619..e7c9e8740 100644 --- a/nextcloud/Dockerfile +++ b/nextcloud/Dockerfile @@ -8,6 +8,21 @@ ENV NEXTCLOUD_PATH="/data/config/www/nextcloud" # Set shell SHELL ["/bin/bash", "-o", "pipefail", "-c"] +# Add bashio +RUN apk add --no-cache \ + curl \ + jq \ + && curl -J -L -o /tmp/bashio.tar.gz \ + "https://github.com/hassio-addons/bashio/archive/v0.7.1.tar.gz" \ + && mkdir /tmp/bashio \ + && tar zxvf \ + /tmp/bashio.tar.gz \ + --strip 1 -C /tmp/bashio \ + \ + && mv /tmp/bashio/lib /usr/lib/bashio \ + && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \ + && rm /tmp/bashio.tar.gz + # modify/copy files RUN sed -i "s|data|share/nextcloud|g" /etc/cont-init.d/* \ && sed -i "s|config|data/config|g" /etc/cont-init.d/* \ From ed5e6c02c0ab4f155a164c6910e770d1b03ed651 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Mon, 18 Jan 2021 15:15:37 +0100 Subject: [PATCH 4/4] Update 51-install_options --- nextcloud/root/etc/cont-init.d/51-install_options | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nextcloud/root/etc/cont-init.d/51-install_options b/nextcloud/root/etc/cont-init.d/51-install_options index 768354767..2c0ef6cb6 100644 --- a/nextcloud/root/etc/cont-init.d/51-install_options +++ b/nextcloud/root/etc/cont-init.d/51-install_options @@ -3,7 +3,7 @@ declare CONFIG declare OCR_LANG -CONFIG=$(