Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update README.md and include automatic restore to iobroker_startup.sh #56

Merged
merged 6 commits into from
Jan 4, 2020
Merged

Update README.md and include automatic restore to iobroker_startup.sh #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
84c3100
Update README.md
duffbeer2000 Dec 27, 2019
1492a15
Include automatic restore to iobroker_startup.sh
duffbeer2000 Dec 27, 2019
0c1f8ed
MAINTAINER is deprecated, switch to LABEL instead
duffbeer2000 Dec 27, 2019
f1b1360
removed apt-get upgrade -y
duffbeer2000 Dec 27, 2019
37c9046
Small Bugfix for restore
duffbeer2000 Dec 27, 2019
22d6b01
Small fix
duffbeer2000 Dec 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Since v3 is possible to set some environment variables to configure a new contai
|AVAHI|false|Installs and activates avahi-daemon for supporting yahka-adapter, can be "true" or "false"|
|LANG|de_DE.UTF‑8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
|LANGUAGE|de_DE:de|The following locales are pre-generated: de_DE:de, en_US:en|
|LC_ALL|de_DE|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
|LC_ALL|de_DE.UTF-8|The following locales are pre-generated: de_DE.UTF-8, en_US.UTF-8|
|PACKAGES|vi|Installs additional packages to your container, needed by some adapters, packages should be seperated by whitespace like "package1 package2 package3"|
|REDIS|false|Activates redis as states-db on startup, fill with "hostname:port" to set redis connection otherwise use "false"(beta)|
|SETGID|1000|For security reasons it might be useful to specify the gid of the containers iobroker user to match an existing group on the docker host|
Expand Down
5 changes: 3 additions & 2 deletions aarch64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM balenalib/aarch64-debian:stretch

MAINTAINER Andre Germann <https://buanet.de>
LABEL maintainer="Andre Germann" \
url="<https://buanet.de>"

ENV DEBIAN_FRONTEND noninteractive

# Install prerequisites (as listed in iobroker installer.sh)
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
RUN apt-get update && apt-get install -y \
acl \
apt-utils \
build-essential \
Expand Down
23 changes: 20 additions & 3 deletions aarch64/scripts/iobroker_startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,26 @@ else
then
echo "Existing installation of ioBroker detected in /opt/iobroker."
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
files=(/opt/iobroker/*)
if [ ${#files[@]} -lt 2 ]; then
if tar -ztvf /opt/iobroker/*.tar.gz "backup/backup.json" &> /dev/null; then
echo "ioBroker Backup detected in /opt/iobroker. Restoring ioBroker..."
mv /opt/iobroker/iobroker_20*.tar.gz /opt/
tar -xf /opt/initial_iobroker.tar -C /
mkdir /opt/iobroker/backups
mv /opt/iobroker_20*.tar.gz /opt/iobroker/backups/
iobroker restore 0
echo "Done."
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker or a valid backup file!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
fi
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
fi
fi
fi
echo ' '
Expand Down
5 changes: 3 additions & 2 deletions amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM debian:stretch

MAINTAINER Andre Germann <https://buanet.de>
LABEL maintainer="Andre Germann" \
url="<https://buanet.de>"

ENV DEBIAN_FRONTEND noninteractive

# Install prerequisites (as listed in iobroker installer.sh)
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
RUN apt-get update && apt-get install -y \
acl \
apt-utils \
build-essential \
Expand Down
23 changes: 20 additions & 3 deletions amd64/scripts/iobroker_startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,26 @@ else
then
echo "Existing installation of ioBroker detected in /opt/iobroker."
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
files=(/opt/iobroker/*)
if [ ${#files[@]} -lt 2 ]; then
if tar -ztvf /opt/iobroker/*.tar.gz "backup/backup.json" &> /dev/null; then
echo "ioBroker Backup detected in /opt/iobroker. Restoring ioBroker..."
mv /opt/iobroker/iobroker_20*.tar.gz /opt/
tar -xf /opt/initial_iobroker.tar -C /
mkdir /opt/iobroker/backups
mv /opt/iobroker_20*.tar.gz /opt/iobroker/backups/
iobroker restore 0
echo "Done."
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker or a valid backup file!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
fi
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
fi
fi
fi
echo ' '
Expand Down
7 changes: 4 additions & 3 deletions armv7hf/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM balenalib/armv7hf-debian:stretch

MAINTAINER Andre Germann <https://buanet.de>

LABEL maintainer="Andre Germann" \
url="<https://buanet.de>"

ENV DEBIAN_FRONTEND noninteractive

# Install prerequisites (as listed in iobroker installer.sh)
RUN apt-get update && apt-get upgrade -y && apt-get install -y \
RUN apt-get update && apt-get install -y \
acl \
apt-utils \
build-essential \
Expand Down
23 changes: 20 additions & 3 deletions armv7hf/scripts/iobroker_startup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,26 @@ else
then
echo "Existing installation of ioBroker detected in /opt/iobroker."
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
files=(/opt/iobroker/*)
if [ ${#files[@]} -lt 2 ]; then
if tar -ztvf /opt/iobroker/*.tar.gz "backup/backup.json" &> /dev/null; then
echo "ioBroker Backup detected in /opt/iobroker. Restoring ioBroker..."
mv /opt/iobroker/iobroker_20*.tar.gz /opt/
tar -xf /opt/initial_iobroker.tar -C /
mkdir /opt/iobroker/backups
mv /opt/iobroker_20*.tar.gz /opt/iobroker/backups/
iobroker restore 0
echo "Done."
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker or a valid backup file!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
fi
else
echo "There is data detected in /opt/iobroker, but it looks like it is no instance of iobroker!"
echo "Please check/ recreate mounted folder/ volume and restart ioBroker container."
exit 1
fi
fi
fi
echo ' '
Expand Down