Small fix for podman

* Add support for custom IP/Port for NTP on ESP32

* Backport changes from esp32

* NTP port is not currently used

* Make pytz dep explicit and update alpine

README.md

@@ -35,6 +35,21 @@ but it is advised to directly use a minimal Linux VM instead
 
 `podman`, with `podman-docker` is the recommended way to run BITE, in rootless mode.
 
+Requirements are:
+
+- `podman`
+- `podman-docker`
+- `catatonit`
+- `docker-compose`
+
+On Fedora 33+:
+
+```bash
+sudo dnf install -y podman podman-docker catatonit docker-compose
+```
+
+To setup `podman` run:
+
 ```bash
 systemctl start --user podman.socket
 export DOCKER_HOST=unix://run/user/$UID/podman/podman.sock

arduino/eeprom_prog/eeprom_prog.ino

@@ -30,8 +30,10 @@ const byte mac[] = {
 const char serial[] = SERIAL;
 
 struct netConfig {
-  IPAddress address = REMOTE_IP;
-  unsigned int port = REMOTE_PORT;
+  IPAddress iot_address = IOT_IP;
+  unsigned int iot_port = IOT_PORT;
+  IPAddress ntp_address = NTP_IP;
+  unsigned int ntp_port = NTP_PORT;
 } config;
 
 void setup() {

arduino/eeprom_prog/settings.h.tmpl

@@ -19,5 +19,7 @@
 */
 
 #define SERIAL "uno_1"
-#define REMOTE_IP {192, 168, 0, 1}
-#define REMOTE_PORT 80
+#define IOT_IP {192, 168, 10, 1}
+#define IOT_PORT 80
+#define NTP_IP {192, 168, 10, 1}
+#define NTP_PORT 123

arduino/tempLightSensor/tempLightSensor.ino

@@ -31,8 +31,6 @@
 #define TELEMETRY_DELAY  10   // second between telemetry samples
 #define AREF_VOLTAGE      3.3 // set aref voltage to 3.3v instead of default 5v
 
-char serial[9];
-
 // const String serverName = "sensor.server.domain";
 const size_t capacity = 2 * JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(2) + 20;
 
@@ -50,11 +48,13 @@ EthernetClient ethClient;
 PubSubClient clientMQTT(ethClient);
 
 struct netConfig {
-  IPAddress address;
-  unsigned int port;
-};
-netConfig config;
+  IPAddress iot_address;
+  unsigned int iot_port;
+  IPAddress ntp_address;
+  unsigned int ntp_port;  // not used
+} config;
 
+char serial[9];
 const String apiURL = "/api/device/subscribe/";
 const String telemetryURL = "/telemetry/";
 
@@ -89,15 +89,17 @@ void setup(void) {
   Serial.println(Ethernet.localIP());
   Serial.println();
   Serial.print("Connecting to: ");
-  Serial.print(config.address);
+  Serial.print(config.iot_address);
   Serial.print(":");
-  Serial.print(config.port);
+  Serial.print(config.iot_port);
   Serial.print(" every ");
   Serial.print(TELEMETRY_DELAY);
   Serial.println("s");
 
 #if USE_INTERNAL_NTP
-  timeClient.setPoolServerIP(config.address);
+  Serial.print("Using NTP: ");
+  Serial.println(config.ntp_address);
+  timeClient.setPoolServerIP(config.ntp_address);
 #endif
   timeClient.begin();
   if (timeClient.update()) {
@@ -115,7 +117,7 @@ void setup(void) {
   // payload["id"] = serverName;
 
 #if USE_MQTT
-  clientMQTT.setServer(config.address, 1883);
+  clientMQTT.setServer(config.iot_address, 1883);
 #endif
 }
 
@@ -175,14 +177,14 @@ void publishData(const netConfig &mqtt, const DynamicJsonDocument &json) {
 #endif
 
 void postData(const netConfig &postAPI, const String &URL, const DynamicJsonDocument &json) {
-  if (ethClient.connect(postAPI.address, postAPI.port)) {
+  if (ethClient.connect(postAPI.iot_address, postAPI.iot_port)) {
     ethClient.print("POST ");
     ethClient.print(URL);
     ethClient.println(" HTTP/1.1");
     ethClient.print("Host: ");
-    ethClient.print(postAPI.address);
+    ethClient.print(postAPI.iot_address);
     ethClient.print(":");
-    ethClient.println(postAPI.port);
+    ethClient.println(postAPI.iot_port);
     ethClient.println("Content-Type: application/json");
     ethClient.print("Content-Length: ");
     ethClient.println(measureJson(json));

docker/docker-compose.yml

@@ -43,7 +43,7 @@ services:
 
   timescale:
     <<: *service_default
-    image: timescale/timescaledb:latest-pg12
+    image: timescale/timescaledb:latest-pg14
     environment:
       POSTGRES_USER: "bite"
       POSTGRES_PASSWORD: "password"

docker/edge/docker-compose.edge.yml

@@ -24,7 +24,7 @@ services:
     image: docker:dind
     privileged: true
     environment:
-      DOCKER_TLS_CERTDIR:
+      DOCKER_TLS_CERTDIR: ""
     networks:
       - net
     ports:

esp32/nvs_prog/nvs_prog.ino

@@ -31,8 +31,10 @@ const char* ssid = SECRET_SSID;
 const char* password = SECRET_PASSWORD;
 
 struct netConfig {
-  IPAddress address = REMOTE_IP;
-  unsigned int port = REMOTE_PORT;
+  IPAddress iot_address = IOT_IP;
+  unsigned int iot_port = IOT_PORT;
+  IPAddress ntp_address = NTP_IP;
+  unsigned int ntp_port = NTP_PORT;
 } config;
 
 void setup() {

esp32/nvs_prog/settings.h.tmpl

@@ -19,7 +19,9 @@
 */
 
 #define SERIAL "<fillme>"
-#define REMOTE_IP {192, 168, 0, 1}
-#define REMOTE_PORT 80
+#define IOT_IP {192, 168, 10, 1}
+#define IOT_PORT 80
+#define NTP_IP {192, 168, 10, 1}
+#define NTP_PORT 123
 #define SECRET_SSID "<fillme>"
 #define SECRET_PASSWORD "<fillme>"

esp32/rssiHall/rssiHall.ino

@@ -48,8 +48,10 @@ WiFiClient ethClient;
 PubSubClient clientMQTT(ethClient);
 
 struct netConfig {
-  IPAddress address;
-  unsigned int port;
+  IPAddress iot_address;
+  unsigned int iot_port;
+  IPAddress ntp_address;
+  unsigned int ntp_port;  // not used
 } config;
 
 char* serial;
@@ -94,15 +96,17 @@ void setup(void) {
   Serial.println(WiFi.localIP());
   Serial.println();
   Serial.print("Connecting to: ");
-  Serial.print(config.address.toString());
+  Serial.print(config.iot_address.toString());
   Serial.print(":");
-  Serial.print(config.port);
+  Serial.print(config.iot_port);
   Serial.print(" every ");
   Serial.print(TELEMETRY_DELAY);
   Serial.println("s");
 
 #if USE_INTERNAL_NTP
-  timeClient.setPoolServerIP(config.address);
+  Serial.print("Using NTP: ");
+  Serial.println(config.ntp_address.toString());
+  timeClient.setPoolServerIP(config.ntp_address);
 #endif
   timeClient.begin();
   if (timeClient.update()) {
@@ -120,7 +124,7 @@ void setup(void) {
   // payload["id"] = serverName;
 
 #if USE_MQTT
-  clientMQTT.setServer(config.address, 1883);
+  clientMQTT.setServer(config.iot_address, 1883);
 #endif
 }
 
@@ -172,14 +176,14 @@ void publishData(const netConfig &mqtt, const DynamicJsonDocument &json) {
 #endif
 
 void postData(const netConfig &postAPI, const String &URL, const DynamicJsonDocument &json) {
-  if (ethClient.connect(postAPI.address, postAPI.port)) {
+  if (ethClient.connect(postAPI.iot_address, postAPI.iot_port)) {
     ethClient.print("POST ");
     ethClient.print(URL);
     ethClient.println(" HTTP/1.1");
     ethClient.print("Host: ");
-    ethClient.print(postAPI.address.toString());
+    ethClient.print(postAPI.iot_address.toString());
     ethClient.print(":");
-    ethClient.println(postAPI.port);
+    ethClient.println(postAPI.iot_port);
     ethClient.println("Content-Type: application/json");
     ethClient.print("Content-Length: ");
     ethClient.println(measureJson(json));