audrius/ioBroker.docker
1
0
Fork 0
mirror of https://github.com/buanet/ioBroker.docker.git synced 2025-12-17 10:29:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

reverting

Browse Source
This commit is contained in:
andre
2020-06-05 22:08:27 +02:00
parent 5db7206b6e
commit 773ad90893
5 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -158,7 +158,7 @@ Thank you!
## Changelog
### v4.2.2beta (2020-06-03)
* workaround for renaming issues on startup
* ~~workaround for renaming issues on startup~~ (fixed in js-controller)
* v4.2.1beta (2020-05-10)
* using node 12 instead of 10
* updated documentation in readme.md

12
aarch64/scripts/iobroker_startup.sh
View File

@@ -166,11 +166,7 @@ if [ -f /opt/iobroker/.install_host ]
then
echo "Looks like this is a new and empty installation of ioBroker."
echo "Hostname needs to be updated to " $(hostname)"..."
oldhostname=$(cat /opt/iobroker/.install_host)
newhostname=$(hostname)
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
# bash iobroker host $(cat /opt/iobroker/.install_host)
bash iobroker host $(cat /opt/iobroker/.install_host)
rm -f /opt/iobroker/.install_host
echo "Done."
echo ' '
@@ -178,11 +174,7 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
then
echo "Hostname in ioBroker does not match the hostname of this container."
echo "Updating hostname to " $(hostname)"..."
oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
newhostname=$(hostname)
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
# bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
echo "Done."
echo ' '
fi

2
amd64/Dockerfile
View File

@@ -70,7 +70,7 @@ RUN apt-get update \
WORKDIR /opt/iobroker/
RUN npm install -g node-gyp
# Testing new js-controller version
# Temporary testing new js-controller version
RUN npm install ioBroker/ioBroker.js-controller#3.1.x
# Backup initial ioBroker and userscript folder

8
amd64/scripts/iobroker_startup.sh
View File

@@ -166,10 +166,6 @@ if [ -f /opt/iobroker/.install_host ]
then
echo "Looks like this is a new and empty installation of ioBroker."
echo "Hostname needs to be updated to " $(hostname)"..."
# oldhostname=$(cat /opt/iobroker/.install_host)
# newhostname=$(hostname)
# sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
# sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
bash iobroker host $(cat /opt/iobroker/.install_host)
rm -f /opt/iobroker/.install_host
echo "Done."
@@ -178,10 +174,6 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
then
echo "Hostname in ioBroker does not match the hostname of this container."
echo "Updating hostname to " $(hostname)"..."
# oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
# newhostname=$(hostname)
# sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
# sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
echo "Done."
echo ' '

12
armv7hf/scripts/iobroker_startup.sh
View File

@@ -166,11 +166,7 @@ if [ -f /opt/iobroker/.install_host ]
then
echo "Looks like this is a new and empty installation of ioBroker."
echo "Hostname needs to be updated to " $(hostname)"..."
oldhostname=$(cat /opt/iobroker/.install_host)
newhostname=$(hostname)
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
# bash iobroker host $(cat /opt/iobroker/.install_host)
bash iobroker host $(cat /opt/iobroker/.install_host)
rm -f /opt/iobroker/.install_host
echo "Done."
echo ' '
@@ -178,11 +174,7 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
then
echo "Hostname in ioBroker does not match the hostname of this container."
echo "Updating hostname to " $(hostname)"..."
oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
newhostname=$(hostname)
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
# bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
echo "Done."
echo ' '
fi