Merge pull request #568 from Paraphraser/20220602-influxdb2-old-menu

20220602 InfluxDB 2 - old-menu branch - PR 2 of 3

Author: Slyke

.templates/influxdb2/service.yml

@@ -0,0 +1,26 @@
+  influxdb2:
+    container_name: influxdb2
+    image: "influxdb:latest"
+    restart: unless-stopped
+    environment:
+      - TZ=Etc/UTC
+      - DOCKER_INFLUXDB_INIT_USERNAME=me
+      - DOCKER_INFLUXDB_INIT_PASSWORD=mypassword
+      - DOCKER_INFLUXDB_INIT_ORG=myorg
+      - DOCKER_INFLUXDB_INIT_BUCKET=mybucket
+      - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=my-super-secret-auth-token
+      - DOCKER_INFLUXDB_INIT_MODE=setup
+    # - DOCKER_INFLUXDB_INIT_MODE=upgrade
+    ports:
+      - "8087:8086"
+    volumes:
+      - ./volumes/influxdb2/data:/var/lib/influxdb2
+      - ./volumes/influxdb2/config:/etc/influxdb2
+      - ./volumes/influxdb2/backup:/var/lib/backup
+    # - ./volumes/influxdb.migrate/data:/var/lib/influxdb:ro
+    healthcheck:
+      test: ["CMD", "influx", "ping"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s

menu.sh

@@ -24,6 +24,7 @@ declare -A cont_array=(
 	[portainer_agent]="Portainer agent"
 	[nodered]="Node-RED"
 	[influxdb]="InfluxDB"
+	[influxdb2]="InfluxDB 2 (requires full 64-bit OS)"
 	[telegraf]="Telegraf (Requires InfluxDB and Mosquitto)"
 	[chronograf]="Chronograf (Requires InfluxDB, Kapacitor optional)"
 	[kapacitor]="Kapacitor (Requires InfluxDB)"
@@ -65,11 +66,12 @@ declare -A cont_array=(
 	# add yours here
 )
 
-declare -a armhf_keys=(
+declare -a keylist=(
 	"portainer-ce"
 	"portainer_agent"
 	"nodered"
 	"influxdb"
+	"influxdb2"
 	"grafana"
 	"mosquitto"
 	"telegraf"
@@ -109,7 +111,6 @@ declare -a armhf_keys=(
 	"home_assistant"
 	# add yours here
 )
-sys_arch=$(uname -m)
 
 #timezones
 timezones() {
@@ -455,22 +456,14 @@ case $mainmenu_selection in
 	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")
+			[ $(grep "^$index\$" ./services/selection.txt) ] && entry_options+=("ON") || entry_options+=("OFF")
 		else
 			entry_options+=("OFF")
 		fi