Update OpenFleet core files (production)

NebraLtd · Feb 22, 2023 · 415e6fd · 415e6fd
1 parent 4e8867b
commit 415e6fd
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 55 deletions.
diff --git a/.github/workflows/build-open-fleet.yml b/.github/workflows/build-open-fleet.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
 
 env:
-  balena-cli: v15.0.2
+  balena-cli: v15.0.3
   raspberrypi3-64: 2023.1.0
   raspberrypi4-64: 2023.1.0
   raspberrypicm4-ioboard: 2.88.4+rev0
@@ -53,24 +53,7 @@ jobs:
       - name: Random sleep (balena API workaround)
         run:  sleep $[ ( $RANDOM % 540 ) + 1 ]s
 
-      - name: Install latest balena-cli (raspi 3)
-        if: env.RASPI3 == 'YES'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y curl unzip zip lxc libarchive-tools aufs-tools
-          sudo modprobe aufs
-          cd /opt/
-          echo "Uses Balena CLI version: ${{ env.balena-cli }}"
-          cat /etc/docker/daemon.json
-          echo "$(grep aufs /proc/filesystems)"
-          echo "$(docker info)" 
-          curl -O -sSL "https://github.com/balena-io/balena-cli/releases/download/${{ env.balena-cli }}/balena-cli-${{ env.balena-cli }}-linux-x64-standalone.zip"
-          unzip balena-cli-*-linux-x64-standalone.zip
-          sudo ln -s /opt/balena-cli/balena /usr/bin/
-          cd ~
-          
-      - name: Install latest balena-cli (rockpi, raspi4)
-        if: env.RASPI3 == 'NO'
+      - name: Install latest balena-cli
         run: |
           sudo apt-get update
           sudo apt-get install -y curl unzip zip
@@ -85,7 +68,7 @@ jobs:
         run: |
           if [ ${{ env.RASPI3 }} == 'YES' ] ; then
             balena login --token ${{ secrets.BALENA_API_TOKEN }} > /dev/null
-          elif [ ${{ github.event.repository.name }} == 'helium-syncrobit' ] || [ ${{ github.event.repository.name }} == 'helium-linxdot' ] || [ ${{ github.event.repository.name }} == 'helium-pycom' ] ; then
+          elif [ ${{ github.event.repository.name }} == 'helium-syncrobit' ] || [ ${{ github.event.repository.name }} == 'helium-linxdot' ] || [ ${{ github.event.repository.name }} == 'helium-pycom' ] || [ ${{ github.event.repository.name }} == 'helium-midas' ] ; then
             balena login --token ${{ secrets.BALENA_API_TOKEN_2 }} > /dev/null
           elif [ ${{ env.ROCKPI }} == 'YES' ] ; then
             balena login --token ${{ secrets.BALENA_API_TOKEN_3 }} > /dev/null
@@ -132,7 +115,7 @@ jobs:
           if [ ${{ env.RASPI3 }} == 'YES' ] ; then
             balena_os="raspberrypi3-64"
             balena_os_version="${{ env.raspberrypi3-64 }}"
-          elif [ ${{ github.event.repository.name }} == 'helium-syncrobit' ] || [ ${{ github.event.repository.name }} == 'helium-linxdot' ] || [ ${{ github.event.repository.name }} == 'helium-pycom' ] ; then
+          elif [ ${{ github.event.repository.name }} == 'helium-syncrobit' ] || [ ${{ github.event.repository.name }} == 'helium-linxdot' ] || [ ${{ github.event.repository.name }} == 'helium-pycom' ] || [ ${{ github.event.repository.name }} == 'helium-midas' ] ; then
             balena_os="raspberrypicm4-ioboard"
             balena_os_version="${{ env.raspberrypicm4-ioboard }}"
           elif [ ${{ env.ROCKPI }} == 'YES' ] ; then

diff --git a/.github/workflows/update-files.yml b/.github/workflows/update-files.yml
@@ -36,31 +36,31 @@ jobs:
           wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/workflows/update-files.yml -O .github/workflows/update-files.yml
           wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/workflows/build-open-fleet.yml -O .github/workflows/build-open-fleet.yml
 
-          if [ $miner == 'pisces' ] ; then  
+          if [ $miner == 'pisces' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-pisces.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.pisces -O config.txt
-          elif [ $miner == 'pycom' ] ; then  
+          elif [ $miner == 'pycom' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-pycom.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.pycom -O config.txt
-          elif [ $miner == 'indoor-868' ] || [ $miner == 'indoor-915' ] || [ $miner == 'indoor-470' ] || [ $miner == 'outdoor-915' ] || [ $miner == 'outdoor-868' ] || [ $miner == 'outdoor-470' ] ; then  
+          elif [ $miner == 'indoor-868' ] || [ $miner == 'indoor-915' ] || [ $miner == 'indoor-470' ] || [ $miner == 'outdoor-915' ] || [ $miner == 'outdoor-868' ] || [ $miner == 'outdoor-470' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.nebra-raspi -O config.txt
-          elif [ $miner == 'indoor-868-rockpi' ] || [ $miner == 'indoor-915-rockpi' ] || [ $miner == 'indoor-470-rockpi' ] || [ $miner == 'oudoor-868-rockpi' ] || [ $miner == 'outdoor-915-rockpi' ] || [ $miner == 'outdoor-470-rockpi' ] ; then  
+          elif [ $miner == 'indoor-868-rockpi' ] || [ $miner == 'indoor-915-rockpi' ] || [ $miner == 'indoor-470-rockpi' ] || [ $miner == 'oudoor-868-rockpi' ] || [ $miner == 'outdoor-915-rockpi' ] || [ $miner == 'outdoor-470-rockpi' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-rockpi.yml -O docker-compose.yml
-          elif [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] ; then  
+          elif [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-rockpi.yml -O docker-compose.yml
-          elif [ $miner == 'controllino' ] ; then  
+          elif [ $miner == 'controllino' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.controllino -O config.txt
-          elif [ $miner == 'sensecap' ] || [ $miner == 'cotx' ] || [ $miner == 'finestra' ] || [ $miner == 'linxdot' ] || [ $miner == 'pantherx1' ] || [ $miner == 'syncrobit' ] ; then  
+          elif [ $miner == 'sensecap' ] || [ $miner == 'cotx' ] || [ $miner == 'finestra' ] || [ $miner == 'linxdot' ] || [ $miner == 'midas' ] || [ $miner == 'pantherx1' ] || [ $miner == 'syncrobit' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.sensecap -O config.txt
-          elif [ $miner == 'risinghf' ] ; then  
+          elif [ $miner == 'risinghf' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.risinghf -O config.txt
           else
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
-            wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.rak -O config.txt 
+            wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/production/balena/config/config.txt.rak -O config.txt
           fi
       - name: Push updated docker compose and balena.yml files
         if: success()
@@ -107,31 +107,31 @@ jobs:
           wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/workflows/update-files.yml -O .github/workflows/update-files.yml
           wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/workflows/build-open-fleet.yml -O .github/workflows/build-open-fleet.yml
 
-          if [ $miner == 'pisces' ] ; then  
+          if [ $miner == 'pisces' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-pisces.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.pisces -O config.txt
-          elif [ $miner == 'pycom' ] ; then  
+          elif [ $miner == 'pycom' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-pycom.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.pycom -O config.txt
-          elif [ $miner == 'indoor-868' ] || [ $miner == 'indoor-915' ] || [ $miner == 'indoor-470' ] || [ $miner == 'outdoor-915' ] || [ $miner == 'outdoor-868' ] || [ $miner == 'outdoor-470' ] ; then  
+          elif [ $miner == 'indoor-868' ] || [ $miner == 'indoor-915' ] || [ $miner == 'indoor-470' ] || [ $miner == 'outdoor-915' ] || [ $miner == 'outdoor-868' ] || [ $miner == 'outdoor-470' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.nebra-raspi -O config.txt
-          elif [ $miner == 'indoor-868-rockpi' ] || [ $miner == 'indoor-915-rockpi' ] || [ $miner == 'indoor-470-rockpi' ] || [ $miner == 'oudoor-868-rockpi' ] || [ $miner == 'outdoor-915-rockpi' ] || [ $miner == 'outdoor-470-rockpi' ] ; then  
+          elif [ $miner == 'indoor-868-rockpi' ] || [ $miner == 'indoor-915-rockpi' ] || [ $miner == 'indoor-470-rockpi' ] || [ $miner == 'oudoor-868-rockpi' ] || [ $miner == 'outdoor-915-rockpi' ] || [ $miner == 'outdoor-470-rockpi' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-rockpi.yml -O docker-compose.yml
-          elif [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] ; then  
+          elif [ $miner == 'linxdot-rkcm3' ] || [ $miner == 'syncrobit-rkcm3' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-rockpi.yml -O docker-compose.yml
-          elif [ $miner == 'controllino' ] ; then  
+          elif [ $miner == 'controllino' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.controllino -O config.txt
-          elif [ $miner == 'sensecap' ] || [ $miner == 'cotx' ] || [ $miner == 'finestra' ] || [ $miner == 'linxdot' ] || [ $miner == 'pantherx1' ] || [ $miner == 'syncrobit' ] ; then  
+          elif [ $miner == 'sensecap' ] || [ $miner == 'cotx' ] || [ $miner == 'finestra' ] || [ $miner == 'linxdot' ] || [ $miner == 'midas' ] || [ $miner == 'pantherx1' ] || [ $miner == 'syncrobit' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.sensecap -O config.txt
-          elif [ $miner == 'risinghf' ] ; then  
+          elif [ $miner == 'risinghf' ] ; then
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.risinghf -O config.txt
           else
             wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/device-compose-files/docker-compose-rpi.yml -O docker-compose.yml
-            wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.rak -O config.txt 
+            wget https://raw.githubusercontent.com/NebraLtd/helium-miner-software/master/balena/config/config.txt.rak -O config.txt
           fi
       - name: Push updated docker compose and balena.yml files
         if: success()

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,15 +3,16 @@ version: '2'
 services:
 
   gateway-config:
-    image: nebraltd/hm-config:a58dc1a
+    image: nebraltd/hm-config:711dd63
     depends_on:
       - dbus-session
       - diagnostics
     environment:
-      - FIRMWARE_VERSION=2023.02.07.0-5
-      - FIRMWARE_SHORT_HASH=4a5e0bc
+      - FIRMWARE_VERSION=2023.02.07.0-15
+      - FIRMWARE_SHORT_HASH=2127c3c
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
       - DBUS_SESSION_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
+    restart: on-failure
     privileged: true
     network_mode: host
     cap_add:
@@ -27,7 +28,7 @@ services:
     stop_signal: SIGINT
 
   packet-forwarder:
-    image: nebraltd/hm-pktfwd:adf7bd5
+    image: nebraltd/hm-pktfwd:4e382fe
     depends_on:
       - multiplexer
     restart: always
@@ -36,14 +37,14 @@ services:
       - pktfwdr:/var/pktfwd
       - nebra:/var/nebra
     environment:
-      - FIRMWARE_VERSION=2023.02.07.0-5
-      - FIRMWARE_SHORT_HASH=4a5e0bc
+      - FIRMWARE_VERSION=2023.02.07.0-15
+      - FIRMWARE_SHORT_HASH=2127c3c
     labels:
       io.balena.features.sysfs: 1
       io.balena.features.procfs: 1
 
   multiplexer:
-    image: nebraltd/hm-pktmux:eb8c757
+    image: nebraltd/hm-pktmux:7e895b7
     restart: always
     depends_on:
       - helium-miner
@@ -56,7 +57,7 @@ services:
       - nebra:/var/nebra
 
   helium-miner:
-    image: nebraltd/hm-miner:arm64-f93cafb
+    image: nebraltd/hm-miner:arm64-9b59111
     depends_on:
       - dbus-session
       - diagnostics
@@ -77,17 +78,17 @@ services:
     restart: on-failure
     environment:
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
-      - FIRMWARE_VERSION=2023.02.07.0-5
-      - FIRMWARE_SHORT_HASH=4a5e0bc
+      - FIRMWARE_VERSION=2023.02.07.0-15
+      - FIRMWARE_SHORT_HASH=2127c3c
 
   diagnostics:
-    image: nebraltd/hm-diag:9265285
+    image: nebraltd/hm-diag:9c96810
     depends_on:
       - dbus-session
     environment:
-      - FIRMWARE_VERSION=2023.02.07.0-5
-      - FIRMWARE_SHORT_HASH=4a5e0bc
-      - DIAGNOSTICS_VERSION=9265285
+      - FIRMWARE_VERSION=2023.02.07.0-15
+      - FIRMWARE_SHORT_HASH=2127c3c
+      - DIAGNOSTICS_VERSION=9c96810
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
     volumes:
       - pktfwdr:/var/pktfwd
@@ -104,6 +105,7 @@ services:
       - /dev/ttyUSB1:/dev/ttyUSB1
       - /dev/ttyUSB2:/dev/ttyUSB2
       - /dev/ttyUSB3:/dev/ttyUSB3
+    restart: always
     privileged: true
     labels:
       io.balena.features.sysfs: 1
@@ -118,8 +120,8 @@ services:
       - dbus:/session/dbus
     environment:
       - DBUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
-      - FIRMWARE_VERSION=2023.02.07.0-5
-      - FIRMWARE_SHORT_HASH=4a5e0bc
+      - FIRMWARE_VERSION=2023.02.07.0-15
+      - FIRMWARE_SHORT_HASH=2127c3c
 
 volumes:
   miner-storage: