Merge remote-tracking branch 'upstream/master'

Author: 877dev

.templates/espruinohub/service.yml

@@ -0,0 +1,6 @@
+  espruinohub:
+    container_name: espruinohub
+    image: humbertosales/espruinohub-docker-rpi
+    network_mode: host
+    privileged: true
+    restart: unless-stopped

.templates/nodered/service.yml

@@ -3,6 +3,7 @@
     build: ./services/nodered/.
     restart: unless-stopped
     user: "0"
+    privileged: true
     env_file: ./services/nodered/nodered.env
     ports:
       - 1880:1880

.templates/rtl_433/service.yml

@@ -5,4 +5,5 @@
       - ./services/rtl_433/rtl_433.env
     devices:
       - /dev/bus/usb
-    restart: unless-stopped
+    restart: unless-stopped
+    

README.md

@@ -2,6 +2,10 @@
 
 The bulk of the README has moved to the Wiki. Please check it out [here](https://github.com/gcgarner/IOTstack/wiki)
 
+* Node-RED: serial port. New template adds privileged which allows acces to serial devices
+* EspurinoHub: is available for testing see wiki entry
+* Menu: Now remembers last stack selection, first build will be blank then the next will select your last containers
+* BUGFIX: fixed issue where rsync gave issue on 'Preserve Environment and Config files'
 * BUGFIX: I incorrecly changed mosquittos volume mapping and it caused the container to restart. Reverted to the old volume mapping
 * Added RTL_433 native and docker installs
 * Added update project through the menu
@@ -31,7 +35,15 @@ The bulk of the README has moved to the Wiki. Please check it out [here](https:/
 
 # Coming soon
 
-* [EspurinoHub](https://hub.docker.com/r/humbertosales/espruinohub-docker-rpi)
+* Detection of arhcitecture for seperate stack options for amd64, armhf, i386
+* autocleanup of backups on cloud
+* motioneye
+* reverse proxy
+* python contaienr
+* webthings gateway
+* Gitea
+* NextCloud
+* OwnCloud
 
 ***
 
@@ -56,6 +68,7 @@ This Docker stack consists of:
 * Plex media server
 * Telegraf (wiki coming soon)
 * RTL_433
+* EspruinoHub (testing)
 
 In addition, there is a write-up and some scripts to get a dynamic DNS via duckdns and VPN up and running.
 

menu.sh

@@ -1,5 +1,27 @@
 #!/bin/bash
 
+declare -A cont_array=(
+	[portainer]="Portainer"
+	[nodered]="Node-RED"
+	[influxdb]="InfluxDB"
+	[telegraf]="Telegraf (Requires InfluxDB and Mosquitto)"
+	[grafana]="Grafana"
+	[mosquitto]="Eclipse-Mosquitto"
+	[postgres]="Postgres"
+	[adminer]="Adminer"
+	[openhab]="openHAB"
+	[zigbee2mqtt]="zigbee2mqtt"
+	[pihole]="Pi-Hole"
+	[plex]="Plex media server"
+	[tasmoadmin]="TasmoAdmin"
+	[rtl_433]="RTL_433 to mqtt"
+    [espruinohub]="EspruinoHub"
+
+)
+declare -a armhf_keys=("portainer" "nodered" "influxdb" "grafana" "mosquitto" "telegraf" "postgres" "adminer" "openhab" "zigbee2mqtt" "pihole" "plex" "tasmoadmin" "rtl_433" "espruinohub" )
+
+sys_arch=$(uname -m)
+
 #timezones
 timezones() {
 
@@ -38,7 +60,7 @@ function yml_builder() {
 		sevice_overwrite=$(whiptail --radiolist --title "Overwrite Option" --notags \
 			"$1 service directory has been detected, use [SPACEBAR] to select you overwrite option" 20 78 12 \
 			"none" "Do not overwrite" "ON" \
-			"env" "Preserve Environment and Config file" "OFF" \
+			"env" "Preserve Environment and Config files" "OFF" \
 			"full" "Pull full service from template" "OFF" \
 			3>&1 1>&2 2>&3)
 
@@ -50,7 +72,7 @@ function yml_builder() {
 			;;
 		"env")
 			echo "...pulled $1 excluding env file"
-			rsync -a -q .templates/$1/ services/$1/ --exclude 'build.sh' --exclude '$1.env' --exclude $(*.conf)
+			rsync -a -q .templates/$1/ services/$1/ --exclude 'build.sh' --exclude '$1.env' --exclude '*.conf'
 			;;
 		"none")
 			echo "...$1 service not overwritten"
@@ -67,6 +89,8 @@ function yml_builder() {
 	#if an env file exists check for timezone
 	[ -f "./services/$1/$1.env" ] && timezones ./services/$1/$1.env
 
+	#add new line then append service
+	echo "">>docker-compose.yml
 	cat $service >>docker-compose.yml
 
 	#test for post build
@@ -118,23 +142,34 @@ case $mainmenu_selection in
 	;;
 	#MAINMENU Build stack ------------------------------------------------------------
 "build")
-	container_selection=$(whiptail --title "Container Selection" --notags --separate-output --checklist \
-		"Use the [SPACEBAR] to select which containers you would like to install" 20 78 12 \
-		"portainer" "Portainer" "ON" \
-		"nodered" "Node-RED" "ON" \
-		"influxdb" "InfluxDB" "ON" \
-		"telegraf" "Telegraf (Requires InfluxDB and Mosquitto)" "OFF" \
-		"grafana" "Grafana" "ON" \
-		"mosquitto" "Eclipse-Mosquitto" "ON" \
-		"postgres" "Postgres" "OFF" \
-		"adminer" "Adminer" "OFF" \
-		"openhab" "openHAB" "OFF" \
-		"zigbee2mqtt" "zigbee2mqtt" "OFF" \
-		"pihole" "Pi-Hole" "OFF" \
-		"plex" "Plex media server" "OFF" \
-		"tasmoadmin" "TasmoAdmin" "OFF" \
-		"rtl_433" "RTL_433 to mqtt" "OFF" \
-		3>&1 1>&2 2>&3)
+
+	title=$'Container Selection'
+	message=$'Use the [SPACEBAR] to select which containers you would like to install'
+	entry_options=()
+
+	#check architecture and display appropriate menu
+	if [ $(echo "$sys_arch" | grep -c "arm") ]; then
+		keylist=("${armhf_keys[@]}")
+	else
+		echo "your architecture is not supported yet"
+		exit
+	fi
+
+	#loop through the array of descriptions
+	for index in "${keylist[@]}"; do
+		entry_options+=("$index")
+		entry_options+=("${cont_array[$index]}")
+
+		#check selection
+		if [ -f ./services/selection.txt ]; then
+			[ $(grep "$index" ./services/selection.txt) ] && entry_options+=("ON") || entry_options+=("OFF")
+		else
+			entry_options+=("OFF")
+		fi
+	done
+
+	container_selection=$(whiptail --title "$title" --notags --separate-output --checklist \
+		"$message" 20 78 12 -- "${entry_options[@]}" 3>&1 1>&2 2>&3)
 
 	mapfile -t containers <<<"$container_selection"
 
@@ -144,10 +179,14 @@ case $mainmenu_selection in
 		echo "version: '2'" >docker-compose.yml
 		echo "services:" >>docker-compose.yml
 
+		# store last sellection
+		[ -f ./services/selection.txt ] && rm ./services/selection.txt
+		touch ./services/selection.txt
 		#Run yml_builder of all selected containers
 		for container in "${containers[@]}"; do
 			echo "Adding $container container"
 			yml_builder "$container"
+			echo "$container" >>./services/selection.txt
 		done
 
 		echo "docker-compose successfully created"
@@ -221,6 +260,7 @@ case $mainmenu_selection in
 	"rclone")
 		sudo apt install -y rclone
 		echo "Please run 'rclone config' to configure the rclone google drive backup"
+		
 		#add enable file for rclone
 		[ -d ~/IOTstack/backups ] || sudo mkdir -p ~/IOTstack/backups/
 		sudo touch ~/IOTstack/backups/rclone