mirror of
https://github.com/buanet/ioBroker.docker.git
synced 2025-12-17 18:39:01 +02:00
Compare commits
48 Commits
v8.0.0
...
v8.1.0-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
721c108742 | ||
|
|
7a455952dd | ||
|
|
a04f210190 | ||
|
|
0f59839695 | ||
|
|
4f15a4df23 | ||
|
|
686b391119 | ||
|
|
d5a6596070 | ||
|
|
7af5507f11 | ||
|
|
2e767eab3d | ||
|
|
97c5e4993d | ||
|
|
568bfab015 | ||
|
|
551dc98282 | ||
|
|
8c9279b867 | ||
|
|
065d0cb4df | ||
|
|
acad72922e | ||
|
|
8fe4d775f5 | ||
|
|
e283d25710 | ||
|
|
f60c87388c | ||
|
|
893908f29d | ||
|
|
16e30c392d | ||
|
|
a954b51223 | ||
|
|
6a55923669 | ||
|
|
bbac132f28 | ||
|
|
9afa6646c2 | ||
|
|
874b6d8af0 | ||
|
|
d126eb190b | ||
|
|
3a745f97bc | ||
|
|
c79d4a9fde | ||
|
|
9e8f8bfd1e | ||
|
|
f56a523e55 | ||
|
|
96d97f5b35 | ||
|
|
954557f28c | ||
|
|
e332bc0e41 | ||
|
|
1b1249eb46 | ||
|
|
d1ef726594 | ||
|
|
d907c34d6a | ||
|
|
3e2589fae9 | ||
|
|
6ddb84333f | ||
|
|
61d655b9e6 | ||
|
|
be18293a5b | ||
|
|
454287d078 | ||
|
|
619de2abc2 | ||
|
|
d160acfd1a | ||
|
|
5419ae2bf1 | ||
|
|
4a68f645f4 | ||
|
|
04805e9ce1 | ||
|
|
8ee1753ea0 | ||
|
|
c7da4e131d |
2
.github/dependencies/.backitup-version
vendored
2
.github/dependencies/.backitup-version
vendored
@@ -1 +1 @@
|
||||
2.5.12
|
||||
2.6.16
|
||||
|
||||
@@ -43,7 +43,7 @@ jobs:
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v2.4.1
|
||||
uses: docker/setup-buildx-action@v2.5.0
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.1.0
|
||||
|
||||
@@ -43,7 +43,7 @@ jobs:
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v2.4.1
|
||||
uses: docker/setup-buildx-action@v2.5.0
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.1.0
|
||||
@@ -64,12 +64,17 @@ jobs:
|
||||
context: ./debian
|
||||
file: ./debian/node18/Dockerfile
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
|
||||
platforms: |
|
||||
linux/amd64
|
||||
linux/arm/v7
|
||||
linux/arm64/v8
|
||||
tags: |
|
||||
buanet/iobroker:beta,
|
||||
buanet/iobroker:${{ env.version }},
|
||||
ghcr.io/buanet/iobroker:beta,
|
||||
ghcr.io/buanet/iobroker:${{ env.version }}
|
||||
provenance: false
|
||||
outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net)
|
||||
|
||||
- name: Delete untagged images from GitHub packages
|
||||
uses: actions/github-script@v6
|
||||
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v2.4.1
|
||||
uses: docker/setup-buildx-action@v2.5.0
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.1.0
|
||||
|
||||
21
.github/workflows/build-debian-image-dev.yml
vendored
21
.github/workflows/build-debian-image-dev.yml
vendored
@@ -9,11 +9,11 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repo
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v3.5.0
|
||||
with:
|
||||
repository: 'buanet/ioBroker.docker'
|
||||
|
||||
- name: Fetching version tag and date
|
||||
- name: Fetch version tag and date
|
||||
id: version
|
||||
run: |
|
||||
VERSION="$(cat .VERSION)"
|
||||
@@ -37,7 +37,7 @@ jobs:
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v2.4.1
|
||||
uses: docker/setup-buildx-action@v2.5.0
|
||||
|
||||
- name: Login to DockerHub
|
||||
uses: docker/login-action@v2.1.0
|
||||
@@ -52,19 +52,24 @@ jobs:
|
||||
username: ${{ secrets.PACKAGES_USER }}
|
||||
password: ${{ secrets.PACKAGES_PASS }}
|
||||
|
||||
- name: Build Docker image
|
||||
- name: Build and push Docker image
|
||||
uses: docker/build-push-action@v4.0.0
|
||||
with:
|
||||
context: ./debian
|
||||
file: ./debian/node18/Dockerfile
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
|
||||
platforms: |
|
||||
linux/amd64
|
||||
linux/arm/v7
|
||||
linux/arm64/v8
|
||||
tags: |
|
||||
buanet/iobroker:dev,
|
||||
ghcr.io/buanet/iobroker:dev
|
||||
provenance: false
|
||||
outputs: type=image,name=target,annotation-index.org.opencontainers.image.description=Official Docker image for ioBroker smarthome software (https://www.iobroker.net)
|
||||
|
||||
- name: Delete untagged images from GitHub packages
|
||||
uses: actions/github-script@v6
|
||||
- name: Delete untagged images from GitHub Container Registry
|
||||
uses: actions/github-script@v6.4.1
|
||||
with:
|
||||
github-token: ${{ secrets.PACKAGES_PASS }}
|
||||
script: |
|
||||
@@ -81,4 +86,4 @@ jobs:
|
||||
env:
|
||||
OWNER: buanet
|
||||
PACKAGE_NAME: iobroker
|
||||
PER_PAGE: 100
|
||||
PER_PAGE: 100
|
||||
|
||||
@@ -38,15 +38,15 @@ jobs:
|
||||
sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
|
||||
mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
|
||||
# amd64
|
||||
sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp
|
||||
mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
|
||||
sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node18/Dockerfile > ./debian/node18/Dockerfile.tmp
|
||||
mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2.1.0
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v2.4.1
|
||||
uses: docker/setup-buildx-action@v2.5.0
|
||||
|
||||
- name: Login to DockerHub (iobroker)
|
||||
uses: docker/login-action@v2.1.0
|
||||
@@ -58,7 +58,7 @@ jobs:
|
||||
uses: docker/build-push-action@v4.0.0
|
||||
with:
|
||||
context: ./debian
|
||||
file: ./debian/node16/Dockerfile
|
||||
file: ./debian/node18/Dockerfile
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
|
||||
tags: |
|
||||
|
||||
10
.github/workflows/build-debian-image-latest.yml
vendored
10
.github/workflows/build-debian-image-latest.yml
vendored
@@ -38,16 +38,15 @@ jobs:
|
||||
sed -e "s/\${VERSION}/$VERSION/" -e "s/\${BUILD}/$DATI/" ./debian/scripts/iobroker_startup.sh > ./debian/scripts/iobroker_startup.tmp
|
||||
mv -f ./debian/scripts/iobroker_startup.tmp ./debian/scripts/iobroker_startup.sh
|
||||
# amd64
|
||||
sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp
|
||||
mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile
|
||||
sed -e "s/\${VERSION}/$VERSION/" -e "s/\${DATI}/$DATI/" ./debian/node18/Dockerfile > ./debian/node18/Dockerfile.tmp
|
||||
mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile
|
||||
|
||||
- name: Set up QEMU
|
||||
uses: docker/setup-qemu-action@v2.1.0
|
||||
|
||||
- name: Set up Docker Buildx
|
||||
id: buildx
|
||||
uses: docker/setup-buildx-action@v2.4.1
|
||||
|
||||
uses: docker/setup-buildx-action@v2.5.0
|
||||
- name: Login to DockerHub (buanet)
|
||||
uses: docker/login-action@v2.1.0
|
||||
with:
|
||||
@@ -65,7 +64,8 @@ jobs:
|
||||
uses: docker/build-push-action@v4.0.0
|
||||
with:
|
||||
context: ./debian
|
||||
file: ./debian/node16/Dockerfile
|
||||
file: ./debian/node18/Dockerfile
|
||||
#provenance: false
|
||||
push: true
|
||||
platforms: linux/amd64,linux/arm/v7,linux/arm64/v8
|
||||
tags: |
|
||||
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
||||
.vscode/
|
||||
5
.vscode/settings.json
vendored
5
.vscode/settings.json
vendored
@@ -1,5 +0,0 @@
|
||||
{
|
||||
"cSpell.enableFiletypes": [
|
||||
"shellscript"
|
||||
]
|
||||
}
|
||||
12
CHANGELOG.md
12
CHANGELOG.md
@@ -1,5 +1,17 @@
|
||||
## Changelog
|
||||
|
||||
### v8.1.0-beta.2 (coming soon)
|
||||
* prohibit restore when startup script is still running
|
||||
* extend time before restart after restore is done
|
||||
* v8.1.0-beta.1 (14.04.2023)
|
||||
* enhance github actions
|
||||
* enhance log output of maintenance script on restore ([#333](https://github.com/buanet/ioBroker.docker/issues/333))
|
||||
* allow iobroker admin to be disabled at startup ([#332](https://github.com/buanet/ioBroker.docker/issues/332))
|
||||
* allow deletion of objects and states db password with value "none" ([#306](https://github.com/buanet/ioBroker.docker/issues/306))
|
||||
|
||||
### v8.0.1 (17.04.2023)
|
||||
* fix calling of "iob setup first" on slaves ([#335](https://github.com/buanet/ioBroker.docker/issues/335))
|
||||
|
||||
### v8.0.0 (20.03.2023)
|
||||
* update readme and docs
|
||||
* remove manifests
|
||||
|
||||
2
debian/node18/Dockerfile
vendored
2
debian/node18/Dockerfile
vendored
@@ -1,7 +1,7 @@
|
||||
FROM debian:bullseye-slim
|
||||
|
||||
LABEL org.opencontainers.image.title="Official ioBroker Docker Image" \
|
||||
org.opencontainers.image.description="Officical Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
|
||||
org.opencontainers.image.description="Official Docker image for ioBroker smarthome software (https://www.iobroker.net)" \
|
||||
org.opencontainers.image.documentation="https://github.com/buanet/ioBroker.docker#readme" \
|
||||
org.opencontainers.image.authors="André Germann <info@buanet.de>" \
|
||||
org.opencontainers.image.url="https://github.com/buanet/ioBroker.docker" \
|
||||
|
||||
25
debian/scripts/iobroker_startup.sh
vendored
25
debian/scripts/iobroker_startup.sh
vendored
@@ -143,9 +143,10 @@ if [[ -f /opt/.first_run ]]; then
|
||||
echo "PACKAGES is set, but OFFLINE_MODE is \"true\". Skipping Linux package installation."
|
||||
elif [[ "$packages" != "" ]]; then
|
||||
echo "PACKAGES is set. Installing the following additional Linux packages: ""$packages"
|
||||
echo "$packages" > /opt/scripts/.docker_config/.packages
|
||||
# echo "$packages" > /opt/scripts/.docker_config/.packages
|
||||
bash /opt/scripts/setup_packages.sh -install
|
||||
fi
|
||||
echo ' '
|
||||
# Register maintenance script
|
||||
echo -n 'Registering maintenance script as command... '
|
||||
echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
|
||||
@@ -302,8 +303,8 @@ else
|
||||
stop_on_error
|
||||
fi
|
||||
|
||||
# if restored a fresh install, runing "iob setup first" for database init, otherwise check database connection
|
||||
if [[ -f /opt/iobroker/.fresh_install ]]; then
|
||||
# if restored a fresh install, running "iob setup first" for database init (but not on slaves!), otherwise check database connection
|
||||
if [[ -f /opt/iobroker/.fresh_install && "$multihost" != "slave" ]]; then
|
||||
echo -n "Initializing a fresh installation of ioBroker... "
|
||||
set +e
|
||||
bash iob setup first > /opt/iobroker/log/iob_setup_first.log 2>&1
|
||||
@@ -352,10 +353,20 @@ else
|
||||
adminhostname=$(bash iobroker object get "$admininstance" --pretty | grep -oP '(?<="host": ")[^"]*')
|
||||
if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin hostname is:" "$adminhostname"; fi
|
||||
else
|
||||
echo "There was a problem detecting the admin instance of your iobroker."
|
||||
echo "Make sure the ioBroker installation you use has an admin instance or try again with a fresh installation and restore your configuration."
|
||||
echo "For more details see https://docs.buanet.de/iobroker-docker-image/docs/#restore"
|
||||
stop_on_error
|
||||
set +e
|
||||
admininstance=$(bash iobroker list instances | grep 'disabled' | grep -m 1 -o 'system.adapter.admin..')
|
||||
set -e
|
||||
if [[ "$admininstance" != "" ]]; then
|
||||
if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin instance is disabled."; fi
|
||||
if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin instance is:" "$admininstance"; fi
|
||||
adminhostname=$(bash iobroker object get "$admininstance" --pretty | grep -oP '(?<="host": ")[^"]*')
|
||||
if [[ "$debug" == "true" ]]; then echo "[DEBUG] Detected admin hostname is:" "$adminhostname"; fi
|
||||
else
|
||||
echo "There was a problem detecting the admin instance of your iobroker."
|
||||
echo "Make sure the ioBroker installation you use has an admin instance or try again with a fresh installation and restore your configuration."
|
||||
echo "For more details see https://docs.buanet.de/iobroker-docker-image/docs/#restore"
|
||||
stop_on_error
|
||||
fi
|
||||
fi
|
||||
# check hostname
|
||||
if [[ "$adminhostname" != "" && "$adminhostname" != "$(hostname)" ]]; then
|
||||
|
||||
34
debian/scripts/maintenance.sh
vendored
34
debian/scripts/maintenance.sh
vendored
@@ -38,6 +38,11 @@ maintenance_enabled() {
|
||||
[[ -f "$healthcheck" && "$(cat "$healthcheck")" == maintenance ]]
|
||||
}
|
||||
|
||||
# check status starting
|
||||
check_starting() {
|
||||
[[ -f "$healthcheck" && "$(cat "$healthcheck")" == starting ]]
|
||||
}
|
||||
|
||||
# display maintenance status
|
||||
maintenance_status() {
|
||||
if maintenance_enabled; then
|
||||
@@ -221,6 +226,8 @@ restart_container() {
|
||||
# restore iobroker
|
||||
restore_iobroker() {
|
||||
echo 'You are now going to perform a restore of your iobroker.'
|
||||
echo 'During the restore process, the container will automatically switch into maintenance mode and stop ioBroker.'
|
||||
echo 'Depending on the restart policy, your container will be stopped or restarted automatically after the restore.'
|
||||
|
||||
if [[ "$autoconfirm" != yes ]]; then
|
||||
local reply
|
||||
@@ -235,14 +242,29 @@ restore_iobroker() {
|
||||
echo 'This command was already confirmed by the -y or --yes option.'
|
||||
fi
|
||||
|
||||
echo -n 'Stopping ioBroker...'
|
||||
stop_iob
|
||||
if check_starting > /dev/null; then
|
||||
echo "Startup script is still running."
|
||||
echo "Please check container log and wait until ioBroker is sucessfully started."
|
||||
echo "Then try again."
|
||||
return 1
|
||||
fi
|
||||
|
||||
# fixing permission errors during restore
|
||||
#chown -R $setuid:$setgid /opt/iobroker/backup
|
||||
if ! maintenance_enabled > /dev/null; then
|
||||
autoconfirm=yes
|
||||
enable_maintenance
|
||||
fi
|
||||
|
||||
echo -n "Restoring ioBroker... "
|
||||
set +e
|
||||
bash iobroker restore 0 > /opt/iobroker/log/restore.log 2>&1
|
||||
return=$?
|
||||
set -e
|
||||
if [[ "$return" -ne 0 ]]; then
|
||||
echo "Failed."
|
||||
echo "For more details see \"/opt/iobroker/log/restore.log\"."
|
||||
echo "Please check backup file location and permissions and try again."
|
||||
return 1
|
||||
fi
|
||||
echo 'Done.'
|
||||
echo ' '
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||||
@@ -254,8 +276,8 @@ restore_iobroker() {
|
||||
echo "!!!! You can view installation process by taking a look at ioBroker log. !!!!"
|
||||
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
|
||||
sleep 10
|
||||
echo 'Container will be stopped or restarted in 5 seconds...'
|
||||
sleep 5
|
||||
echo 'Container will be stopped or restarted in 10 seconds...'
|
||||
sleep 10
|
||||
echo 'stopping' > "$healthcheck"
|
||||
pkill -u root
|
||||
}
|
||||
|
||||
16
debian/scripts/setup_iob_db.sh
vendored
16
debian/scripts/setup_iob_db.sh
vendored
@@ -99,7 +99,13 @@ set_objectsdb_port() {
|
||||
fi
|
||||
}
|
||||
set_objectsdb_pass() {
|
||||
if [[ "$objectsdbpass" != "$(jq -r '.objects.options.auth_pass' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
|
||||
if [[ "$objectsdbpass" == "none" ]]; then
|
||||
echo "IOB_OBJECTSDB_PASS is available but value is set to \"none\"."
|
||||
echo -n "Removing password of objects db... "
|
||||
jq '.objects.options.auth_pass = null' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
|
||||
write_iobroker_json
|
||||
echo 'Done.'
|
||||
elif [[ "$objectsdbpass" != "$(jq -r '.objects.options.auth_pass' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
|
||||
echo "IOB_OBJECTSDB_PASS is available but value is different from detected ioBroker installation."
|
||||
echo -n "Setting password of objects db... "
|
||||
jq --arg value "$objectsdbpass" '.objects.options.auth_pass = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
|
||||
@@ -188,7 +194,13 @@ set_statesdb_port() {
|
||||
fi
|
||||
}
|
||||
set_statesdb_pass() {
|
||||
if [[ "$statesdbpass" != "$(jq -r '.states.options.auth_pass' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
|
||||
if [[ "$statesdbpass" == "none" ]]; then
|
||||
echo "IOB_STATESDB_PASS is available but value is set to \"none\"."
|
||||
echo -n "Removing password of states db... "
|
||||
jq '.states.options.auth_pass = null' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
|
||||
write_iobroker_json
|
||||
echo 'Done.'
|
||||
elif [[ "$statesdbpass" != "$(jq -r '.states.options.auth_pass' /opt/iobroker/iobroker-data/iobroker.json)" ]]; then
|
||||
echo "IOB_STATESDB_PASS is available but value is different from detected ioBroker installation."
|
||||
echo -n "Setting password of states db... "
|
||||
jq --arg value "$statesdbpass" '.states.options.auth_pass = $value' /opt/iobroker/iobroker-data/iobroker.json > /opt/iobroker/iobroker-data/iobroker.json.tmp
|
||||
|
||||
85
debian/scripts/setup_packages.sh
vendored
85
debian/scripts/setup_packages.sh
vendored
@@ -1,36 +1,69 @@
|
||||
#!/bin/bash
|
||||
|
||||
# bash strict mode
|
||||
set -euo pipefail
|
||||
|
||||
# Reading ENV
|
||||
set +u
|
||||
packages=$PACKAGES
|
||||
debug=$DEBUG
|
||||
set -u
|
||||
|
||||
export DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
if [ "$1" == "-install" ]
|
||||
then
|
||||
apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
|
||||
packages=$(cat /opt/scripts/.docker_config/.packages)
|
||||
echo ' '
|
||||
for i in $packages; do
|
||||
if [ "$(dpkg-query -W -f='${Status}' "$i" 2>/dev/null | grep -c "ok installed")" -eq 0 ];
|
||||
then
|
||||
echo -n "$i is not installed. Installing... "
|
||||
DEBIAN_FRONTEND=noninteractive apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1
|
||||
return=$?
|
||||
if [[ "$return" -ne 0 ]]; then
|
||||
echo "Failed."
|
||||
echo "For more details see \"/opt/scripts/setup_packages.log\"."
|
||||
echo ' '
|
||||
else
|
||||
echo "Done."
|
||||
fi
|
||||
else
|
||||
echo "$i is already installed."
|
||||
fi
|
||||
check_package_preq() {
|
||||
# check for influx packages
|
||||
if [[ "$i" == "influxdb" || "$i" == "influxdb2-cli" ]]; then
|
||||
# add influxdata repo keys
|
||||
wget -qO- https://repos.influxdata.com/influxdata-archive_compat.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg > /dev/null
|
||||
echo 'deb [signed-by=/etc/apt/trusted.gpg.d/influxdata-archive_compat.gpg] https://repos.influxdata.com/debian stable main' | sudo tee /etc/apt/sources.list.d/influxdata.list
|
||||
apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
|
||||
fi
|
||||
}
|
||||
check_package_validity() {
|
||||
# check string for double spaces
|
||||
while echo "$packages" | grep -q ' '; do
|
||||
packages=$(echo "$packages" | sed 's/ / /g')
|
||||
done
|
||||
elif [ "$1" == "-update" ]; then
|
||||
# remove packages when "influxdb" AND "influxdb2-cli"
|
||||
if echo "$packages" | grep -qw "influxdb" && echo "$packages" | grep -qw "influxdb2-cli"; then
|
||||
echo "PACKAGES includes influxdb AND influxdb2-cli."
|
||||
echo "As installing both packages together is not possible, they will be skipped."
|
||||
packages=$(echo "$packages" | sed 's/influxdb2-cli//g;s/influxdb//g')
|
||||
# check string for double spaces again
|
||||
while echo "$packages" | grep -q ' '; do
|
||||
packages=$(echo "$packages" | sed 's/ / /g')
|
||||
done
|
||||
if [[ $debug == "true" ]]; then echo "[DEBUG] New list of packages: ""$packages"; fi
|
||||
echo ' '
|
||||
fi
|
||||
}
|
||||
|
||||
if [[ "$1" == "-install" ]]; then
|
||||
echo ' '
|
||||
apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
|
||||
check_package_validity
|
||||
for i in $packages; do
|
||||
if ! dpkg -s "$i" >/dev/null 2>&1; then
|
||||
echo -n "$i is not installed. Installing... "
|
||||
check_package_preq >> /opt/scripts/setup_packages.log 2>&1
|
||||
if ! apt-get -q -y install "$i" >> /opt/scripts/setup_packages.log 2>&1; then
|
||||
echo "Failed."
|
||||
echo "For more details see \"/opt/scripts/setup_packages.log\"."
|
||||
else
|
||||
echo "Done."
|
||||
fi
|
||||
else
|
||||
echo "$i is already installed."
|
||||
fi
|
||||
done
|
||||
elif [[ "$1" == "-update" ]]; then
|
||||
echo -n "Updating Linux packages on first run... "
|
||||
apt-get -q update >> /opt/scripts/setup_packages.log 2>&1
|
||||
return=$?
|
||||
apt-get -q -y upgrade >> /opt/scripts/setup_packages.log 2>&1
|
||||
return1=$?
|
||||
if [[ "$return" -ne 0 || "$return1" -ne 0 ]]; then
|
||||
apt-get -q -y upgrade >> /opt/scripts/setup_packages.log 2>&1
|
||||
return2=$?
|
||||
if [[ "$return1" -ne 0 || "$return2" -ne 0 ]]; then
|
||||
echo "Failed."
|
||||
echo "For more details see \"/opt/scripts/setup_packages.log\"."
|
||||
echo "Make sure the container has internet access to get the latest package updates."
|
||||
@@ -47,4 +80,4 @@ fi
|
||||
apt-get -qq autoclean -y && apt-get -qq autoremove && apt-get -qq clean
|
||||
rm -rf /tmp/* /var/tmp/* && rm -rf /root/.cache/* && rm -rf /var/lib/apt/lists/* && rm -f /opt/scripts/.docker_config/.packages
|
||||
|
||||
exit 0
|
||||
exit 0
|
||||
@@ -35,10 +35,11 @@ New major image versions (e.g. v6, v7, v8) always include a new major version of
|
||||
It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead.
|
||||
|
||||
### Node 18 versions
|
||||
* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
|
||||
* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
|
||||
* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
|
||||
|
||||
### Node 16 versions
|
||||
* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile)
|
||||
* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile)
|
||||
* [`v7.1.2`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile)
|
||||
* [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
##### Note: The image provided as [iobroker/iobroker](https://hub.docker.com/r/iobroker/iobroker) is a duplicate of [buanet/iobroker](https://hub.docker.com/r/buanet/iobroker)
|
||||
##### Note: The image provided as [iobroker/iobroker](https://hub.docker.com/r/iobroker/iobroker) is a mirror of [buanet/iobroker](https://hub.docker.com/r/buanet/iobroker)
|
||||
|
||||
<img src="https://github.com/buanet/ioBroker.docker/raw/main/docs/img/iobroker_logo.png" width="600" title="ioBroker Logo">
|
||||
|
||||
@@ -37,10 +37,11 @@ New major image versions (e.g. v6, v7, v8) always include a new major version of
|
||||
It is highly recommended not to use the `latest` tag for production, especially when using any kind of automated update procedure like watchtower. Please use the `latest-v[major_version]` tag instead.
|
||||
|
||||
### Node 18 versions
|
||||
* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`v8.0.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
|
||||
* [`v8.0.1`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest-v8`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile), [`latest`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
|
||||
* [`v8.0.0`](https://github.com/buanet/ioBroker.docker/blob/v8.0.0/debian/node18/Dockerfile)
|
||||
|
||||
### Node 16 versions
|
||||
* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`v7.2.0-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile)
|
||||
* [`v7.2.0`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile), [`latest-v7`](https://github.com/buanet/ioBroker.docker/blob/v7.2.0/debian/node16/Dockerfile)
|
||||
* [`v7.1.2`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile), [`v7.1.2-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.1.2/debian/node16/Dockerfile)
|
||||
* [`v7.0.1`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-amd64`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm32v7`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile), [`v7.0.1-arm64v8`](https://github.com/buanet/ioBroker.docker/blob/v7.0.1/debian/node16/Dockerfile)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user