audrius/ioBroker.docker
1
0
Fork 0
mirror of https://github.com/buanet/ioBroker.docker.git synced 2026-02-28 07:11:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

some small improvements

Browse Source
This commit is contained in:
buanet
2021-08-28 18:08:58 +02:00
parent e0d7f82135
commit 36c1695311
5 changed files with 75 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
amd64/scripts/iobroker_startup.sh
View File

@@ -40,8 +40,11 @@ echo "----- -----"
echo "----- System -----"
echo -n "----- " && echo -n "$(printf "%-10s %-23s" arch: $(uname -m))" && echo " -----"
echo "----- -----"
echo "----- Docker-Image -----"
echo -n "----- " && echo -n "$(printf "%-10s %-23s" image: ${VERSION})" && echo " -----"
echo -n "----- " && echo -n "$(printf "%-10s %-23s" build: ${BUILD})" && echo " -----"
echo "----- -----"
echo "----- Versions -----"
echo -n "----- " && echo -n "$(printf "%-10s %-23s" image: $VERSION)" && echo " -----"
echo -n "----- " && echo -n "$(printf "%-10s %-23s" node: $(node -v))" && echo " -----"
echo -n "----- " && echo -n "$(printf "%-10s %-23s" npm: $(npm -v))" && echo " -----"
echo "----- -----"
@@ -74,15 +77,27 @@ echo ' '
# Adding ckeck file for easy docker detection by ioBroker
echo "$VERSION" > /opt/scripts/.docker_config/.thisisdocker
# Installing additional packages and setting uid/gid
# Installing/ updating additional packages and setting uid/gid
if [ "$packages" != "" ] || [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $setgid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $setuid ] || [ -f /opt/.firstrun ]
then
if [ -f /opt/.firstrun ]
then
echo "Updating Linux packages on first run..."
bash /opt/scripts/setup_packages.sh -update
echo "Done."
echo ' '
echo "Registering maintenance script as command..."
echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
echo "alias maint=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
echo "Done."
echo ' '
fi
if [ "$packages" != "" ]
then
echo "Installing additional packages is set by ENV."
echo "The following packages will be installed:" $packages"..."
echo $packages > /opt/scripts/.packages
bash /opt/scripts/setup_packages.sh
bash /opt/scripts/setup_packages.sh -install
echo "Done."
echo ' '
fi
@@ -95,14 +110,6 @@ then
echo "Done."
echo ' '
fi
if [ -f /opt/.firstrun ]
then
echo "Registering maintenance script as command."
echo "alias maintenance=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
echo "alias maint=\'/opt/scripts/maintenance.sh\'" >> /root/.bashrc
echo "Done."
echo ' '
fi
else
echo "Nothing to do here."
echo ' '

17
amd64/scripts/setup_packages.sh
View File

@@ -1,11 +1,16 @@
#!/bin/bash
apt-get -qq update
packages=$(cat /opt/scripts/.packages)
for i in $packages; do
sudo apt-get -qq -y install $i
done
if [ $1 == "-install" ]
then
apt-get -qq update
packages=$(cat /opt/scripts/.packages)
for i in $packages; do
sudo apt-get -qq -y install $i
done
elif [ $1 == "-update" ]
apt-get -qq update
apt-get -qq -y upgrade
fi
rm -rf /var/lib/apt/lists/*
rm -f /opt/scripts/.packages