From 67eef7f455e491356eba75e369ca17a40aa1cc33 Mon Sep 17 00:00:00 2001 From: buanet Date: Sat, 9 May 2020 23:45:49 +0200 Subject: [PATCH 1/6] updated readme.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 550dd5d..8551c97 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ IoBroker for Docker is a Dockerimage for ioBroker IoT platform (http://www.iobroker.net). -It was originally created for a Synology Disk Station 1515+ with DSM 6 and official Docker package installed. After more than three years of development it might be the best documented and still maintained Dockrimage for running ioBroker ioT platform with Docker. +It was originally created for a Synology Disk Station 1515+ with DSM 6 and official Docker package installed. After more than three years of development it might be the best documented and still maintained Dockrimage for running ioBroker ioT platform with Docker. Since v4.0.0 the image is available for the following architectures: amd64, armv7hf, aarch64.
If you need more please let me know by opening a Github issue. @@ -20,7 +20,7 @@ If you need more please let me know by opening a Github issue. Normally a new major version (e.g. v2, v4 and upcoming v5) of the image comes with a new, preinstalled major node version! If you are updating an existing installation to a new major version (e.g. from v4 to v5) you have to perform some additional steps inside ioBroker! For more details please see official ioBroker documentation: [EN](https://www.iobroker.net/#en/documentation/install/updatenode.md) | [DE](https://www.iobroker.net/#de/documentation/install/updatenode.md).
-You might avoid these procedure if you use my "Best practise" hint for "upgrading your ioBroker container". +You might avoid these procedure if you use my "Best practise" hint for "upgrading your container". In any case make a backup first! ## Getting started @@ -123,7 +123,7 @@ To get familiar with that feature try the following: Create a Container, mount a To avoid conflicts when upgrading your container or getting in trouble when accedentially upgrading your container to a new major version I prefer using the version tag like "V4.2.0" instead of "latest" for creating yor container. Just think about when I tell you it is not possible to download a new image version of a specific tag as long as a conrainer depends on it.
By the way it also makes it more safe to keep your image up to date by using "watchtower" or something like that. -### Upgrading you container +### Upgrading your container If you want to upgrade your ioBroker container to a new major version (e.g. from v4 to v5) I would prefer to do that by creating a bockup in ioBroker (by "iobroker backup" or backitup adapter) and restoring it to a completely new container. All you need is time an the following steps: * make a backup by Commandline ("iobroker backup") or backitup adapter From 3a39f16e32a8b2a61ceee8106fc53462e05b5e56 Mon Sep 17 00:00:00 2001 From: andre <> Date: Thu, 21 May 2020 00:23:40 +0200 Subject: [PATCH 2/6] fix download of iobroker install.sh --- aarch64/Dockerfile | 2 +- amd64/Dockerfile | 2 +- armv7hf/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile index e11bd09..3a22f81 100644 --- a/aarch64/Dockerfile +++ b/aarch64/Dockerfile @@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / RUN apt-get update \ - && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \ + && curl -sL https://iobroker.net/install.sh | bash - \ && echo $(hostname) > /opt/iobroker/.install_host \ && echo $(hostname) > /opt/.firstrun \ && rm -rf /var/lib/apt/lists/* diff --git a/amd64/Dockerfile b/amd64/Dockerfile index f0a3d33..fc300d5 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / RUN apt-get update \ - && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \ + && curl -sL https://iobroker.net/install.sh | bash - \ && echo $(hostname) > /opt/iobroker/.install_host \ && echo $(hostname) > /opt/.firstrun \ && rm -rf /var/lib/apt/lists/* diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile index a550df3..73f0434 100644 --- a/armv7hf/Dockerfile +++ b/armv7hf/Dockerfile @@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / RUN apt-get update \ - && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \ + && curl -sL https://iobroker.net/install.sh | bash - \ && echo $(hostname) > /opt/iobroker/.install_host \ && echo $(hostname) > /opt/.firstrun \ && rm -rf /var/lib/apt/lists/* From df973abf16ec05d4c90e351d40e5e0b4a709ce9b Mon Sep 17 00:00:00 2001 From: andre <> Date: Thu, 21 May 2020 00:24:56 +0200 Subject: [PATCH 3/6] fix download of iobroker install.sh --- aarch64/Dockerfile | 2 +- amd64/Dockerfile | 2 +- armv7hf/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile index 0c85450..b30333d 100644 --- a/aarch64/Dockerfile +++ b/aarch64/Dockerfile @@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / RUN apt-get update \ - && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \ + && curl -sL https://iobroker.net/install.sh | bash - \ && echo $(hostname) > /opt/iobroker/.install_host \ && echo $(hostname) > /opt/.firstrun \ && rm -rf /var/lib/apt/lists/* diff --git a/amd64/Dockerfile b/amd64/Dockerfile index 9f15b1d..d52a3a8 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / RUN apt-get update \ - && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \ + && curl -sL https://iobroker.net/install.sh | bash - \ && echo $(hostname) > /opt/iobroker/.install_host \ && echo $(hostname) > /opt/.firstrun \ && rm -rf /var/lib/apt/lists/* diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile index 54df7f9..2489367 100644 --- a/armv7hf/Dockerfile +++ b/armv7hf/Dockerfile @@ -61,7 +61,7 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh # Install ioBroker WORKDIR / RUN apt-get update \ - && curl -sL https://raw.githubusercontent.com/ioBroker/ioBroker/stable-installer/installer.sh | bash - \ + && curl -sL https://iobroker.net/install.sh | bash - \ && echo $(hostname) > /opt/iobroker/.install_host \ && echo $(hostname) > /opt/.firstrun \ && rm -rf /var/lib/apt/lists/* From c0bd56f7e5c3cdd3554386e45452400658f85290 Mon Sep 17 00:00:00 2001 From: Andre Germann Date: Mon, 29 Jun 2020 21:18:49 +0200 Subject: [PATCH 4/6] Update .VERSION --- .VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.VERSION b/.VERSION index 536a94d..d3845ad 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v4.2.4beta +v5.0.0 From e18e74ef3d3487b3726ecd30bc1bd6b72520f2ea Mon Sep 17 00:00:00 2001 From: buanet Date: Tue, 30 Jun 2020 08:16:13 +0200 Subject: [PATCH 5/6] Temporary fixing js-controller version --- aarch64/Dockerfile | 3 +++ amd64/Dockerfile | 3 +++ armv7hf/Dockerfile | 3 +++ 3 files changed, 9 insertions(+) diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile index 383975d..efb11c1 100644 --- a/aarch64/Dockerfile +++ b/aarch64/Dockerfile @@ -70,6 +70,9 @@ RUN apt-get update \ WORKDIR /opt/iobroker/ RUN npm install -g node-gyp +# Temporary updating js-controller to not stable version +RUN npm install iobroker.js-controller@3.1.6 + # Backup initial ioBroker and userscript folder RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \ && tar -cf /opt/initial_userscripts.tar /opt/userscripts diff --git a/amd64/Dockerfile b/amd64/Dockerfile index 8ded5d9..cbb7dfe 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -70,6 +70,9 @@ RUN apt-get update \ WORKDIR /opt/iobroker/ RUN npm install -g node-gyp +# Temporary updating js-controller to not stable version +RUN npm install iobroker.js-controller@3.1.6 + # Backup initial ioBroker and userscript folder RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \ && tar -cf /opt/initial_userscripts.tar /opt/userscripts diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile index bbf2285..1ba6e52 100644 --- a/armv7hf/Dockerfile +++ b/armv7hf/Dockerfile @@ -70,6 +70,9 @@ RUN apt-get update \ WORKDIR /opt/iobroker/ RUN npm install -g node-gyp +# Temporary updating js-controller to not stable version +RUN npm install iobroker.js-controller@3.1.6 + # Backup initial ioBroker and userscript folder RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \ && tar -cf /opt/initial_userscripts.tar /opt/userscripts From 5a230230219131c425d956ef56676461f4531065 Mon Sep 17 00:00:00 2001 From: Andre Germann Date: Tue, 30 Jun 2020 08:19:49 +0200 Subject: [PATCH 6/6] Update .VERSION --- .VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.VERSION b/.VERSION index d3845ad..e9ae6f0 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v5.0.0 +v5.0.0beta