Light miner: Remove dbus container

* remove dbus container
NebraLtd · Mar 27, 2022 · be65525 · be65525
1 parent eb6d47f
commit be65525
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ This repository generates the main docker-compose.yml (follow the steps to gener
 
 The `docker-compose.yml` file is pushed to [Balena](https://www.balena.io/) (using GitHub Actions), which in turn pulls down the various Docker images outlined below.
 
-There are currently six different services running within this device, which are all outlined below.
+There are currently four different services running within this device, which are all outlined below.
 
 ## Diagnostics
 
@@ -36,12 +36,6 @@ Repo: [github.com/NebraLtd/hm-gatewayrs](https://github.com/NebraLtd/hm-gatewayr
 
 This container is the actual Helium Gateway-rs software (from upstream), with the required configuration files added.
 
-## DBus Session
-
-Repo: [github.com/balenablocks/dbus](https://github.com/balenablocks/dbus)
-
-This container doesn't serve any purpose any more and will be removed.
-
 #  Quick Start
 
 This is a guide to help you get started with the repository and get it running on your local device. This guide is focused on pushing the repository onto a Raspberry Pi using Balena.

diff --git a/settings.ini b/settings.ini
@@ -1,9 +1,9 @@
 [versions]
-FIRMWARE_VERSION=2022.03.07.0-2
+FIRMWARE_VERSION=1.0.0-alpha.23
 DIAGNOSTICS_VERSION=fb63618
-CONFIG_VERSION=e5ac58c
+CONFIG_VERSION=b5fa96c
 PKTFWD_VERSION=b95cc46
-GATEWAY_VERSION=409c974
+GATEWAY_VERSION=d3b1c78
 
 [quectel_modem]
 MODEM_SERIAL0=/dev/ttyUSB0

diff --git a/templates/docker-compose.template b/templates/docker-compose.template
@@ -7,19 +7,14 @@ services:
     depends_on:
       - helium-miner
       - diagnostics
-      - dbus-session
     environment:
       - FIRMWARE_VERSION={{FIRMWARE_VERSION}}
       - FIRMWARE_SHORT_HASH={{ENV.FIRMWARE_SHORT_HASH}}
       - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/host/run/dbus/system_bus_socket
-      - DBUS_SESSION_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
     privileged: true
     network_mode: host
     cap_add:
       - NET_ADMIN
-    volumes:
-      - miner-storage:/var/data
-      - dbus:/session/dbus
     labels:
       io.balena.features.sysfs: 1
       io.balena.features.kernel-modules: 1
@@ -48,15 +43,16 @@ services:
       - {{I2C_DEVICE}}:{{I2C_DEVICE}}
     restart: on-failure
     environment:
-      - DBUS_SYSTEM_BUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
       - FIRMWARE_VERSION={{FIRMWARE_VERSION}}
       - I2C_DEVICE={{I2C_DEVICE}}
+    volumes:
+      - pktfwdr:/var/pktfwd
+      - miner-storage:/var/data
 
   diagnostics:
     image: nebraltd/hm-diag:{{DIAGNOSTICS_VERSION}}
     depends_on:
       - helium-miner
-      - dbus-session
     environment:
       - FIRMWARE_VERSION={{FIRMWARE_VERSION}}
       - FIRMWARE_SHORT_HASH={{ENV.FIRMWARE_SHORT_HASH}}
@@ -81,17 +77,6 @@ services:
       io.balena.features.procfs: 1
       io.balena.features.dbus: 1
 
-  dbus-session:
-    image: balenablocks/dbus:rpi-0.0.2
-    restart: always
-    volumes:
-      - dbus:/session/dbus
-    environment:
-      - DBUS_ADDRESS=unix:path=/session/dbus/session_bus_socket
-      - FIRMWARE_VERSION={{FIRMWARE_VERSION}}
-      - FIRMWARE_SHORT_HASH={{ENV.FIRMWARE_SHORT_HASH}}
-
 volumes:
   miner-storage:
   pktfwdr:
-  dbus: