From b36373dc3b61f63fb656c72a4da6eb7065637534 Mon Sep 17 00:00:00 2001 From: buanet Date: Wed, 27 Jan 2021 22:19:59 +0100 Subject: [PATCH 1/3] rename repo --- README.md | 12 ++++++------ aarch64/scripts/iobroker_startup.sh | 14 +++++++------- amd64/scripts/iobroker_startup.sh | 14 +++++++------- armv7hf/scripts/iobroker_startup.sh | 14 +++++++------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 6ce3663..7f9b2ce 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -# ioBroker for Docker +# Official Docker Image for ioBroker -[![Release](https://img.shields.io/github/v/release/buanet/docker-iobroker)](https://github.com/buanet/docker-iobroker/releases) +[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/releases) [![Build Status](https://travis-ci.org/buanet/docker-iobroker.svg?branch=master)](https://travis-ci.org/buanet/docker-iobroker)
[![Image Size](https://img.shields.io/docker/image-size/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker) [![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker) [![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)
-[![Source](https://img.shields.io/badge/source-github-blue)](https://github.com/buanet/docker-iobroker) -[![License](https://img.shields.io/github/license/buanet/docker-iobroker)](https://github.com/buanet/docker-iobroker/blob/master/LICENSE.md) +[![Source](https://img.shields.io/badge/source-github-blue)](https://github.com/buanet/ioBroker.docker) +[![License](https://img.shields.io/github/license/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md) [![Donate](https://img.shields.io/badge/donate-paypal-blue)](https://paypal.me/buanet) IoBroker for Docker is a ready to use Docker image for ioBroker IoT platform (http://www.iobroker.net). @@ -172,7 +172,7 @@ After this steps the startup script inside the container will automatically dete ### Beta testing -If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the readme.md file for beta versions [here](https://github.com/buanet/docker-iobroker/blob/beta/README.md). Please make sure to read the changelog before testing beta versions. +If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the readme.md file for beta versions [here](https://github.com/buanet/ioBroker.docker/blob/beta/README.md). Please make sure to read the changelog before testing beta versions. ### Subscribe to updates @@ -182,7 +182,7 @@ You will find the channel here: https://t.me/buanet_tutorials ### Support the project The easiest way to support this project is to leave me some likes/ stars on Github and Docker hub!
-If you want to give something back, feel free to take a look into the [open issues](https://github.com/buanet/docker-iobroker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and helping me answering questions, fixing bugs or adding new features!
+If you want to give something back, feel free to take a look into the [open issues](https://github.com/buanet/ioBroker.docker/issues) or the [ioBroker forum thread](http://forum.iobroker.net/viewtopic.php?f=17&t=5089) and helping me answering questions, fixing bugs or adding new features!
And if you want to buy me a beer instead, you can do this here:
Thank you! diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh index ff23abd..e9fa617 100644 --- a/aarch64/scripts/iobroker_startup.sh +++ b/aarch64/scripts/iobroker_startup.sh @@ -131,7 +131,7 @@ then then echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"." echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 else echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..." @@ -292,7 +292,7 @@ elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ] then echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too." echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!" - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "master" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ] then @@ -305,7 +305,7 @@ then echo "Multihost is set as \"slave\" by ENV. But no external objects db is set." echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db." echo "Please check your settings and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ] then @@ -317,7 +317,7 @@ elif [ "$multihost" != "" ] then echo "Multihost is set but it seems like some configuration is missing." echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 fi #Configuring states db host @@ -333,7 +333,7 @@ elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ] then echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too." echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!" - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ] then @@ -346,7 +346,7 @@ then echo "Multihost is set as \"slave\" by ENV. But no external states db is set." echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db." echo "Please check your settings and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ] then @@ -358,7 +358,7 @@ elif [ "$multihost" != "" ] then echo "Multihost is set but it seems like some configuration is missing." echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 fi diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh index ff23abd..e9fa617 100644 --- a/amd64/scripts/iobroker_startup.sh +++ b/amd64/scripts/iobroker_startup.sh @@ -131,7 +131,7 @@ then then echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"." echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 else echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..." @@ -292,7 +292,7 @@ elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ] then echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too." echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!" - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "master" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ] then @@ -305,7 +305,7 @@ then echo "Multihost is set as \"slave\" by ENV. But no external objects db is set." echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db." echo "Please check your settings and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ] then @@ -317,7 +317,7 @@ elif [ "$multihost" != "" ] then echo "Multihost is set but it seems like some configuration is missing." echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 fi #Configuring states db host @@ -333,7 +333,7 @@ elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ] then echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too." echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!" - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ] then @@ -346,7 +346,7 @@ then echo "Multihost is set as \"slave\" by ENV. But no external states db is set." echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db." echo "Please check your settings and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ] then @@ -358,7 +358,7 @@ elif [ "$multihost" != "" ] then echo "Multihost is set but it seems like some configuration is missing." echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 fi diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh index ff23abd..e9fa617 100644 --- a/armv7hf/scripts/iobroker_startup.sh +++ b/armv7hf/scripts/iobroker_startup.sh @@ -131,7 +131,7 @@ then then echo "IoBroker backup file detected in /opt/iobroker. But Multihost is set to \"slave\"." echo "Restoring a backup is not supported on Multihost slaves. Please check configuration and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 else echo "IoBroker backup file detected in /opt/iobroker. Preparing restore..." @@ -292,7 +292,7 @@ elif [ "$multihost" = "master" ] && [ "$objectsdbhost" = "127.0.0.1" ] then echo "Multihost is set as \"master\" by ENV. But objects db host is set to \"127.0.0.1\" by ENV too." echo "This configuration will not work! Please change or remove ENV \"IOB_OBJECTSDB_HOST\" and start over!" - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "master" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ] then @@ -305,7 +305,7 @@ then echo "Multihost is set as \"slave\" by ENV. But no external objects db is set." echo "You have to configure ENVs \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" to connect to a maser objects db." echo "Please check your settings and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "slave" ] && [ "$objectsdbtype" != "" ] && [ "$objectsdbhost" != "" ] && [ "$objectsdbport" != "" ] then @@ -317,7 +317,7 @@ elif [ "$multihost" != "" ] then echo "Multihost is set but it seems like some configuration is missing." echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_OBJECTSDB_TYPE\", \"IOB_OBJECTSDB_HOST\" and \"IOB_OBJECTSDB_PORT\" correctly and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 fi #Configuring states db host @@ -333,7 +333,7 @@ elif [ "$multihost" = "master" ] && [ "$statesdbhost" = "127.0.0.1" ] then echo "Multihost is set as \"master\" by ENV. But states db host is set to \"127.0.0.1\" by ENV too." echo "This configuration will not work! Please change or remove ENV \"IOB_STATESDB_HOST\" and start over!" - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "master" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ] then @@ -346,7 +346,7 @@ then echo "Multihost is set as \"slave\" by ENV. But no external states db is set." echo "You have to configure ENVs \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESDB_PORT\" to connect to a maser states db." echo "Please check your settings and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 elif [ "$multihost" = "slave" ] && [ "$statesdbtype" != "" ] && [ "$statesdbhost" != "" ] && [ "$statesdbport" != "" ] then @@ -358,7 +358,7 @@ elif [ "$multihost" != "" ] then echo "Multihost is set but it seems like some configuration is missing." echo "Please checke if you have configured the ENVs \"MULTIHOST\", \"IOB_STATESDB_TYPE\", \"IOB_STATESDB_HOST\" and \"IOB_STATESTDB_PORT\" correctly and start over." - echo "For more information see readme.md on Github (https://github.com/buanet/docker-iobroker)." + echo "For more information see readme.md on Github (https://github.com/buanet/ioBroker.docker)." exit 1 fi From 7ebb36e831f6c72e50044df748e73507da457666 Mon Sep 17 00:00:00 2001 From: buanet Date: Fri, 2 Apr 2021 00:43:23 +0200 Subject: [PATCH 2/3] changes for versioning and automated build --- .VERSION | 2 +- .travis.yml | 112 ------------------ CHANGELOG.md | 5 + amd64/manifest.yml | 7 ++ {armv7hf => arm32v7}/Dockerfile | 0 arm32v7/manifest.yml | 8 ++ {aarch64 => arm32v7}/scripts/healthcheck.sh | 0 .../scripts/iobroker_startup.sh | 0 {aarch64 => arm32v7}/scripts/maintenance.sh | 0 {aarch64 => arm32v7}/scripts/setup_avahi.sh | 0 .../scripts/setup_packages.sh | 0 {aarch64 => arm32v7}/scripts/setup_zwave.sh | 0 .../scripts/userscript_everystart_example.sh | 0 .../scripts/userscript_firststart_example.sh | 0 {aarch64 => arm64v8}/Dockerfile | 0 arm64v8/manifest.yml | 8 ++ {armv7hf => arm64v8}/scripts/healthcheck.sh | 0 .../scripts/iobroker_startup.sh | 0 {armv7hf => arm64v8}/scripts/maintenance.sh | 0 {armv7hf => arm64v8}/scripts/setup_avahi.sh | 0 .../scripts/setup_packages.sh | 0 {armv7hf => arm64v8}/scripts/setup_zwave.sh | 0 .../scripts/userscript_everystart_example.sh | 0 .../scripts/userscript_firststart_example.sh | 0 manifest.yml | 4 +- .../backup_iobroker_folder.sh | 84 ------------- 26 files changed, 31 insertions(+), 199 deletions(-) delete mode 100644 .travis.yml create mode 100644 amd64/manifest.yml rename {armv7hf => arm32v7}/Dockerfile (100%) create mode 100644 arm32v7/manifest.yml rename {aarch64 => arm32v7}/scripts/healthcheck.sh (100%) rename {aarch64 => arm32v7}/scripts/iobroker_startup.sh (100%) rename {aarch64 => arm32v7}/scripts/maintenance.sh (100%) rename {aarch64 => arm32v7}/scripts/setup_avahi.sh (100%) rename {aarch64 => arm32v7}/scripts/setup_packages.sh (100%) rename {aarch64 => arm32v7}/scripts/setup_zwave.sh (100%) rename {aarch64 => arm32v7}/scripts/userscript_everystart_example.sh (100%) rename {aarch64 => arm32v7}/scripts/userscript_firststart_example.sh (100%) rename {aarch64 => arm64v8}/Dockerfile (100%) create mode 100644 arm64v8/manifest.yml rename {armv7hf => arm64v8}/scripts/healthcheck.sh (100%) rename {armv7hf => arm64v8}/scripts/iobroker_startup.sh (100%) rename {armv7hf => arm64v8}/scripts/maintenance.sh (100%) rename {armv7hf => arm64v8}/scripts/setup_avahi.sh (100%) rename {armv7hf => arm64v8}/scripts/setup_packages.sh (100%) rename {armv7hf => arm64v8}/scripts/setup_zwave.sh (100%) rename {armv7hf => arm64v8}/scripts/userscript_everystart_example.sh (100%) rename {armv7hf => arm64v8}/scripts/userscript_firststart_example.sh (100%) delete mode 100644 opt/maintenance-scripts/backup_iobroker_folder.sh diff --git a/.VERSION b/.VERSION index 6b7ace3..68076de 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -v5.1.0 +v5.2.0beta diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 151b37d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,112 +0,0 @@ -sudo: required - -branches: - only: - - master - - beta - -services: - - docker - -language: bash - -env: - global: - - secure: "iqK7JBsQiYceKOvRkmSa6okzXn3BygEPZjffby4agaVCwIt2SYLAcBOisOoKDpyAX+DUWlHz3gITImVa+uIna6Ue7k4C2AGJVDr87G6iq57Tn6yjrfhPs/TW9/CWvKg/G4uvKEnycMiLDXdcctSMwRr3ZwzJEdeEdmNZVsd2LP/5U0I/2K2Io22tNciSKhqlSaIfhK4f6Jk7xffnQFjwy+P9qPN18oI1fDyeHx6ZWyN3YhQQ4eGyxHjxZjlhCxSvu5R4DMf1jFIoLRAr6G5jrQacn0pG8PtBVLoYT4RsPy+fwUtXmnWWjeXK0IrU1njZf/DUteI9xnaDcHzZYj+d7MeSUc6BuWOyx9lO3ZwBWDNycYsKaF5so4RpdzoY/gfJMlK3uWDbADb46dWzPD5gb3pEROKau3fBDHS5eaR5e1Bxzz6FGoYWYfsQHqpg9g7v4BRFq+Jh0+v47fdyMxgK/Nm4+r7+ht77Usu29+X6X8F4iwrBJ/ix5xIf7iMoH/ZGvq6BEKi/1t9zdXMugcWOqwlYx9k6J9bQhBfw8YucLmgl3ynzrPaLlPEpY9cnb7hcOUDZoHI7KK2zF/y3yfNr2BqlRbm39HFWfnwuJPO5VLYGs5QubeVj9u1M+5Qo4erPuQBBc4mHP4eF2PmRA+wiVWki0z+U2skFQppkCfrbH8c=" - - secure: "iqoZUcWgZueNQrNldF/ugwyU1LR5E+doTfjY0exQqAKjntG5n2QqYZ/+dX1gqvkfy1kuMINTBWfqSALbhfTTK7EfUjqmcnaks4CMVZQkhH/FyCOYHqSBSSN7j4XeHt1sXn1FRiSpyrZOUoOuyqoBRe3JoWhdQZAGxNzX3sJllwnKa6M0D6D2l9tUyTWO/jxhgTIoYBSrXvb68ZsCU9jlNBJbylfvEFwuSlwvfa+Mz9vAeCTuza9XDnvcxgwVq3r+YGxfmAhK9fOAvN+lPN+KA0LcIzBaW0sh24voqjfh/pLpsl03zeGNdWzS9r2qYPCP0N3asb5P6CVEbbAGYO1T5PvU78ILXGi4+/x/32O6/I9oXpMVQCFHNn0Gn/8BPRHY4ZOYI9ItnhV9Ncp7hhAWAAqf3KC5GM89l9R5KxFY3bhN/p8nuGresUDU5d57YkaV8rOhPpr0dbAyKFtuzG0+bT1N2ekXyTyMHeAGKiGwfD9bAS4qx6asFO5uw6UriBHNzJ59Cy3GT+W1CctaEuvqJlc6Iqz2KaBozEqnNFcpE2Grny4bzr5fp+b1qCO9TE2LhHU/LR5FTLjQ2wf9/raTM6yboq+guKeXxpySa2w8ABDq0OUAw4mrKqJQJohzBkl3oYTpWUG2JGEyMAJxjkmH0/3GwZESPNLaaYVjQByTDDY=" - - VERSION="$(cat .VERSION)" - - MAJORVERSION="$(cat .VERSION | cut -c 1-2 | sed -r 's#^(.{0})#\1latest-#')" - -before_install: - - wget https://github.com/estesp/manifest-tool/releases/download/v0.7.0/manifest-tool-linux-amd64 -O manifest-tool - - chmod +x manifest-tool - - docker run --rm --privileged multiarch/qemu-user-static:register - - echo "$HUB_PASS" | docker login -u "$HUB_USER" --password-stdin - -jobs: - include: - - stage: Build images - env: - - ARCH=amd64 - - JOB_NAME="Build images" - script: - - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh - - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./amd64 - - - stage: Build images - env: - - ARCH=aarch64 - - JOB_NAME="Build images" - script: - - docker run --rm --privileged multiarch/qemu-user-static:register --reset - - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh - - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./aarch64 - - - stage: Build images - env: - - ARCH=armv7hf - - JOB_NAME="Build images" - script: - - docker run --rm --privileged multiarch/qemu-user-static:register --reset - - sed -i "s/\$VERSION/${VERSION}/g" $ARCH/scripts/iobroker_startup.sh - - docker build -t "buanet/iobroker:$VERSION-$ARCH" ./armv7hf - - - stage: Manifest - env: - - JOB_NAME="Manifest" - script: - - echo Placeholder - -after_success: -# tag and push built images - - > - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then - docker push buanet/iobroker:$VERSION-$ARCH - fi - - if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Build images" ] ; then - docker push buanet/iobroker:$VERSION-$ARCH - fi - -# update repository manifest for multiarch and push to hub - - > - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then - cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml - - #manifest for image: buanet/iobroker:version - cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml - - #manifest for image: buanet/iobroker:latest - cat manifest.yaml | sed "s/\$DOCKERTAG/latest/g" > manifestlatest.yaml - - #manifest for image: buanet/iobroker:latest-majorversion - cat manifest.yaml | sed "s/\$DOCKERTAG/${MAJORVERSION}/g" > manifestmajorversion.yaml - - #push to hub - mv manifestversion.yaml iobroker.yaml - ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml - - mv manifestlatest.yaml iobroker.yaml - ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml - - mv manifestmajorversion.yaml iobroker.yaml - ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml - fi - - if [ "$TRAVIS_BRANCH" == "beta" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$JOB_NAME" == "Manifest" ]; then - - cat manifest.yml | sed "s/\$VERSION/${VERSION}/g" > manifest.yaml - - #manifest for image: buanet/iobroker:version - cat manifest.yaml | sed "s/\$DOCKERTAG/${VERSION}/g" > manifestversion.yaml - - #manifest for image: buanet/iobroker:beta - cat manifest.yaml | sed "s/\$DOCKERTAG/beta/g" > manifestbeta.yaml - - #push to hub - mv manifestversion.yaml iobroker.yaml - ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml - - mv manifestbeta.yaml iobroker.yaml - ./manifest-tool --username $HUB_USER --password $HUB_PASS push from-spec iobroker.yaml - fi diff --git a/CHANGELOG.md b/CHANGELOG.md index ff1640d..1d13163 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ## Changelog +### v5.2.0beta (2021-04-02) +* some renaming to optimize automated build +* changes in versioning +* delete travis for automated build + ### v5.1.0 (2020-11-05) * v5.0.2beta (2020-07-28) * added docker tag for majorversion latest diff --git a/amd64/manifest.yml b/amd64/manifest.yml new file mode 100644 index 0000000..c508c10 --- /dev/null +++ b/amd64/manifest.yml @@ -0,0 +1,7 @@ +image: buanet/iobroker:$VERSION-amd64 +manifests: + - + image: buanet/iobroker:$VERSION-amd64 + platform: + architecture: amd64 + os: linux diff --git a/armv7hf/Dockerfile b/arm32v7/Dockerfile similarity index 100% rename from armv7hf/Dockerfile rename to arm32v7/Dockerfile diff --git a/arm32v7/manifest.yml b/arm32v7/manifest.yml new file mode 100644 index 0000000..eba6823 --- /dev/null +++ b/arm32v7/manifest.yml @@ -0,0 +1,8 @@ +image: buanet/iobroker:$VERSION-arm32v7 +manifests: + - + image: buanet/iobroker:$VERSION-arm32v7 + platform: + architecture: arm + variant: v7 + os: linux diff --git a/aarch64/scripts/healthcheck.sh b/arm32v7/scripts/healthcheck.sh similarity index 100% rename from aarch64/scripts/healthcheck.sh rename to arm32v7/scripts/healthcheck.sh diff --git a/aarch64/scripts/iobroker_startup.sh b/arm32v7/scripts/iobroker_startup.sh similarity index 100% rename from aarch64/scripts/iobroker_startup.sh rename to arm32v7/scripts/iobroker_startup.sh diff --git a/aarch64/scripts/maintenance.sh b/arm32v7/scripts/maintenance.sh similarity index 100% rename from aarch64/scripts/maintenance.sh rename to arm32v7/scripts/maintenance.sh diff --git a/aarch64/scripts/setup_avahi.sh b/arm32v7/scripts/setup_avahi.sh similarity index 100% rename from aarch64/scripts/setup_avahi.sh rename to arm32v7/scripts/setup_avahi.sh diff --git a/aarch64/scripts/setup_packages.sh b/arm32v7/scripts/setup_packages.sh similarity index 100% rename from aarch64/scripts/setup_packages.sh rename to arm32v7/scripts/setup_packages.sh diff --git a/aarch64/scripts/setup_zwave.sh b/arm32v7/scripts/setup_zwave.sh similarity index 100% rename from aarch64/scripts/setup_zwave.sh rename to arm32v7/scripts/setup_zwave.sh diff --git a/aarch64/scripts/userscript_everystart_example.sh b/arm32v7/scripts/userscript_everystart_example.sh similarity index 100% rename from aarch64/scripts/userscript_everystart_example.sh rename to arm32v7/scripts/userscript_everystart_example.sh diff --git a/aarch64/scripts/userscript_firststart_example.sh b/arm32v7/scripts/userscript_firststart_example.sh similarity index 100% rename from aarch64/scripts/userscript_firststart_example.sh rename to arm32v7/scripts/userscript_firststart_example.sh diff --git a/aarch64/Dockerfile b/arm64v8/Dockerfile similarity index 100% rename from aarch64/Dockerfile rename to arm64v8/Dockerfile diff --git a/arm64v8/manifest.yml b/arm64v8/manifest.yml new file mode 100644 index 0000000..657cde3 --- /dev/null +++ b/arm64v8/manifest.yml @@ -0,0 +1,8 @@ +image: buanet/iobroker:$VERSION-arm64v8 +manifests: + - + image: buanet/iobroker:$VERSION-arm64v8 + platform: + architecture: arm64 + variant: v8 + os: linux diff --git a/armv7hf/scripts/healthcheck.sh b/arm64v8/scripts/healthcheck.sh similarity index 100% rename from armv7hf/scripts/healthcheck.sh rename to arm64v8/scripts/healthcheck.sh diff --git a/armv7hf/scripts/iobroker_startup.sh b/arm64v8/scripts/iobroker_startup.sh similarity index 100% rename from armv7hf/scripts/iobroker_startup.sh rename to arm64v8/scripts/iobroker_startup.sh diff --git a/armv7hf/scripts/maintenance.sh b/arm64v8/scripts/maintenance.sh similarity index 100% rename from armv7hf/scripts/maintenance.sh rename to arm64v8/scripts/maintenance.sh diff --git a/armv7hf/scripts/setup_avahi.sh b/arm64v8/scripts/setup_avahi.sh similarity index 100% rename from armv7hf/scripts/setup_avahi.sh rename to arm64v8/scripts/setup_avahi.sh diff --git a/armv7hf/scripts/setup_packages.sh b/arm64v8/scripts/setup_packages.sh similarity index 100% rename from armv7hf/scripts/setup_packages.sh rename to arm64v8/scripts/setup_packages.sh diff --git a/armv7hf/scripts/setup_zwave.sh b/arm64v8/scripts/setup_zwave.sh similarity index 100% rename from armv7hf/scripts/setup_zwave.sh rename to arm64v8/scripts/setup_zwave.sh diff --git a/armv7hf/scripts/userscript_everystart_example.sh b/arm64v8/scripts/userscript_everystart_example.sh similarity index 100% rename from armv7hf/scripts/userscript_everystart_example.sh rename to arm64v8/scripts/userscript_everystart_example.sh diff --git a/armv7hf/scripts/userscript_firststart_example.sh b/arm64v8/scripts/userscript_firststart_example.sh similarity index 100% rename from armv7hf/scripts/userscript_firststart_example.sh rename to arm64v8/scripts/userscript_firststart_example.sh diff --git a/manifest.yml b/manifest.yml index c8d851a..eec7aa3 100644 --- a/manifest.yml +++ b/manifest.yml @@ -6,13 +6,13 @@ manifests: architecture: amd64 os: linux - - image: buanet/iobroker:$VERSION-aarch64 + image: buanet/iobroker:$VERSION-arm64v8 platform: architecture: arm64 variant: v8 os: linux - - image: buanet/iobroker:$VERSION-armv7hf + image: buanet/iobroker:$VERSION-arm32v7 platform: architecture: arm variant: v7 diff --git a/opt/maintenance-scripts/backup_iobroker_folder.sh b/opt/maintenance-scripts/backup_iobroker_folder.sh deleted file mode 100644 index aae1bb0..0000000 --- a/opt/maintenance-scripts/backup_iobroker_folder.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/bin/bash - -# Backupscript fuer ein Backup von ioBroker unter Docker auf einer Synology Disk Station (Sicherung des ioBroker-Verzeichnises). -# Vorhaltezeit der letzten Backups: 90 Tage, ältere Backups werden automatisch geloescht. -# -# By Andre Germann -# Version 1.1 (22.09.2017) -# -# ACHTUNG: Dieses Script muss vorher auf die Synology Disk Station kopiert und dann auch dort ausgefuehrt werden! -# Fuer die geplante, regelmaessige Ausfuehrung bietet sich der Aufgabenplaner der Disk Station an. -# -# ACHTUNG: Dieses Script stoppt vor der Sicherung des Verzeichnises den ioBroker Container! -# Zur Sicherheit wird empfohlen ioBroker vor dem Backup innerhalb des Containers zu stoppen. -# Dieses kann zum Beispiel ueber den vorherigen Aufruf des Scripts iobroker_stop.sh aus ioBroker heraus erledigt werden. - - -# Deklaration der Variablen. Pfade und Bezeichnungen muessen ggf. entsprechend angepasst werden. - -iobrokerPATH='/volume1/docker/iobroker_mount' # Pfad des gemounteten ioBroker-Verzeichnises (zu sicherndes Verzeichnis) auf der Synology Disk Station -backupPATH='/volume1/docker/iobroker_backup/archiv' # Pfad zum Speichern des Backups -iobrokerCONTAINERNAME='iobroker' # Name des ioBroker-Containers in Docker - - -# Start Script - Ab hier muss nichts mehr geaendert werden! - -echo "#####################################################" -echo "############## Backupscript gestartet. ##############" -echo "#####################################################" - - -### Backup ioBroker-Verzeichnis - - -# ioBroker-Container stoppen - -echo "" -echo "Der ioBroker-Container ($iobrokerCONTAINERNAME) in Docker wird gestoppt..." - -docker stop $iobrokerCONTAINERNAME > /dev/null - -echo "Container in Docker gestoppt." -echo "" -echo "######################################################" -sleep 5 - - -# Backupdatei erstellen - -echo "" -echo "Der Ordner $iobrokerPATH wird gesichert..." - -tar -C "$iobrokerPATH" -czf "$backupPATH/backup-$(date +%Y-%m-%d_%H-%M).tar.gz" . - -echo "Sicherung des Ordners erstellt." -echo "" -echo "######################################################" -sleep 5 - - -# Alte Backups loeschen (Loescht per "rm" alle "*.tar.gz"-Dateien im Ordner, die aelter als 90 Tage sind) - -echo "" -echo "Entfernen alter Backups aus dem Verzeichnis $backupPATH..." - -find -P "$backupPATH/" -maxdepth 1 -type f \( -name '*.tar.gz' \) -ctime +90 -exec rm {} \; - -echo "Alte Backups wurden entfernt." -echo "" -echo "######################################################" -sleep 5 - - -# ioBroker-Container starten - -echo "" -echo "Der ioBroker-Container ($iobrokerCONTAINERNAME) in Docker wird gestartet..." - -docker start $iobrokerCONTAINERNAME > /dev/null - -echo "Container in Docker gestartet." -echo "" -echo "################### Script Ende ######################" - -exit 0 From d4b03a100361dcc6012d7d9e721ca6dc602dc3e9 Mon Sep 17 00:00:00 2001 From: buanet Date: Fri, 2 Apr 2021 00:53:58 +0200 Subject: [PATCH 3/3] fix badges --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 04c9721..2583f94 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ # Official Docker Image for ioBroker -[![Source](https://img.shields.io/badge/source-github-blue)](https://github.com/buanet/ioBroker.docker) -[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/releases) -[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/issues)
-[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest)](https://hub.docker.com/repository/docker/buanet/iobroker) -[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker) -[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker)](https://hub.docker.com/repository/docker/buanet/iobroker)
-[![License](https://img.shields.io/github/license/buanet/ioBroker.docker)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md) -[![Donate](https://img.shields.io/badge/donate-paypal-blue)](https://paypal.me/buanet) +[![Source](https://img.shields.io/badge/source-github-blue?style=flat)](https://github.com/buanet/ioBroker.docker) +[![Release](https://img.shields.io/github/v/release/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/releases) +[![Github Issues](https://img.shields.io/github/issues/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/issues)
+[![Docker Image Size (tag)](https://img.shields.io/docker/image-size/buanet/iobroker/latest?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker) +[![Docker Pulls](https://img.shields.io/docker/pulls/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker) +[![Docker Stars](https://img.shields.io/docker/stars/buanet/iobroker?style=flat)](https://hub.docker.com/repository/docker/buanet/iobroker)
+[![License](https://img.shields.io/github/license/buanet/ioBroker.docker?style=flat)](https://github.com/buanet/ioBroker.docker/blob/master/LICENSE.md) +[![Donate](https://img.shields.io/badge/donate-paypal-blue?style=flat)](https://paypal.me/buanet) This image is a ready to use Docker image for ioBroker IoT platform (http://www.iobroker.net).