v4.1.37

Update dependency balena-io/balena-cli to v18.2.29

.github/actionlint.yaml

@@ -0,0 +1,8 @@
+self-hosted-runner:
+  # Labels of self-hosted runner in array of strings.
+  labels:
+  - "distro:jammy"
+# Configuration variables in array of strings defined in your repository or
+# organization. `null` means disabling configuration variables check.
+# Empty array means no configuration variable is allowed.
+config-variables: null

.github/workflows/flowzone.yml

@@ -50,8 +50,3 @@ jobs:
         github.event_name == 'pull_request_target'
       )) && github.event.action != 'closed'
     secrets: inherit
-    with:
-      environment: balena-cloud.com
-      fleet: balena/open-balena
-      # https://dash.cloudflare.com/001b3ed2352612aaa068aca1b0022736/balena-devices.com/dns
-      dns_tld: balena-devices.com

.github/workflows/renovate.json

@@ -0,0 +1,15 @@
+{
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": [
+        ".*"
+      ],
+      "matchStrings": [
+        ".*amiFilter=(?<packageName>.*?)\n(.*currentImageName=(?<currentDigest>.*?)\n)?(.*\n)?.*?(?<depName>[a-zA-Z0-9-_:]*)[ ]*?[:|=][ ]*?[\"|']?(?<currentValue>ami-[a-z0-9]{17})[\"|']?.*"
+      ],
+      "datasourceTemplate": "aws-machine-image",
+      "versioningTemplate": "aws-machine-image"
+    }
+  ]
+}

CHANGELOG.md

@@ -4,6 +4,471 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v4.1.37
+## (2024-07-12)
+
+* Update dependency balena-io/balena-cli to v18.2.29 [Self-hosted Renovate Bot]
+
+# v4.1.36
+## (2024-07-12)
+
+* Update dependency balena-io/balena-cli to v18.2.28 [Self-hosted Renovate Bot]
+
+# v4.1.35
+## (2024-07-12)
+
+* Update balena/open-balena-vpn Docker tag to v11.30.26 [Self-hosted Renovate Bot]
+
+# v4.1.34
+## (2024-07-11)
+
+* Update balena/open-balena-registry Docker tag to v2.39.62 [Self-hosted Renovate Bot]
+
+# v4.1.33
+## (2024-07-11)
+
+* Update aws-actions/configure-aws-credentials digest to 96589f5 [Self-hosted Renovate Bot]
+
+# v4.1.32
+## (2024-07-11)
+
+* Update balena/open-balena-s3 Docker tag to v2.28.49 [Self-hosted Renovate Bot]
+
+# v4.1.31
+## (2024-07-11)
+
+* Update balena/open-balena-api Docker tag to v25.2.5 [Self-hosted Renovate Bot]
+
+# v4.1.30
+## (2024-07-11)
+
+* Update dependency balena-io/balena-cli to v18.2.25 [Self-hosted Renovate Bot]
+
+# v4.1.29
+## (2024-07-10)
+
+* Update dependency balena-io/balena-cli to v18.2.22 [Self-hosted Renovate Bot]
+
+# v4.1.28
+## (2024-07-09)
+
+* Update balena/open-balena-registry Docker tag to v2.39.61 [Self-hosted Renovate Bot]
+
+# v4.1.27
+## (2024-07-09)
+
+* Update balena/open-balena-api Docker tag to v25.2.0 [Self-hosted Renovate Bot]
+
+# v4.1.26
+## (2024-07-09)
+
+* Relax regex to match all Let's Encrypt CNs [Anton Belodedenko]
+
+# v4.1.25
+## (2024-07-09)
+
+* Update balena/open-balena-s3 Docker tag to v2.28.48 [Self-hosted Renovate Bot]
+
+# v4.1.24
+## (2024-07-09)
+
+* Update balena/open-balena-api Docker tag to v25.1.29 [Self-hosted Renovate Bot]
+
+# v4.1.23
+## (2024-07-08)
+
+* Update balena/open-balena-vpn Docker tag to v11.30.23 [Self-hosted Renovate Bot]
+
+# v4.1.22
+## (2024-07-08)
+
+* Update balena/open-balena-api Docker tag to v25.1.27 [Self-hosted Renovate Bot]
+
+# v4.1.21
+## (2024-07-08)
+
+* Make tests more reliable [Anton Belodedenko]
+
+# v4.1.20
+## (2024-07-05)
+
+* Update dependency balena-io/balena-cli to v18.2.20 [Self-hosted Renovate Bot]
+
+# v4.1.19
+## (2024-07-05)
+
+* Update dependency balena-io/balena-cli to v18.2.19 [Self-hosted Renovate Bot]
+
+# v4.1.18
+## (2024-07-05)
+
+* Update balena/open-balena-api Docker tag to v25.1.24 [Self-hosted Renovate Bot]
+
+# v4.1.17
+## (2024-07-04)
+
+* Update balena/open-balena-registry Docker tag to v2.39.60 [Self-hosted Renovate Bot]
+
+# v4.1.16
+## (2024-07-04)
+
+* Update aws-actions/configure-aws-credentials digest to febab93 [Self-hosted Renovate Bot]
+
+# v4.1.15
+## (2024-07-04)
+
+* pin balena-cli version [Anton Belodedenko]
+
+# v4.1.14
+## (2024-07-04)
+
+* shellcheck/lint workflow(s) [Anton Belodedenko]
+
+# v4.1.13
+## (2024-07-02)
+
+* Update balena/open-balena-api Docker tag to v25.1.19 [Self-hosted Renovate Bot]
+
+# v4.1.12
+## (2024-07-02)
+
+* Only delete your (matrix) own test instance [Anton Belodedenko]
+
+# v4.1.11
+## (2024-07-02)
+
+* Update balena/open-balena-s3 Docker tag to v2.28.47 [Self-hosted Renovate Bot]
+
+# v4.1.10
+## (2024-06-27)
+
+* Update aws-actions/configure-aws-credentials digest to af7e7d4 [Self-hosted Renovate Bot]
+
+# v4.1.9
+## (2024-06-27)
+
+* capture termination instance reason [Anton Belodedenko]
+
+# v4.1.8
+## (2024-06-27)
+
+* Exit instead of breaking out of while loops [Anton Belodedenko]
+
+# v4.1.7
+## (2024-06-26)
+
+* Renovate AWS/EC2 AMI(s) [Anton Belodedenko]
+
+# v4.1.6
+## (2024-06-25)
+
+* check if AWS/EC2 instance is still running [Anton Belodedenko]
+
+# v4.1.5
+## (2024-06-25)
+
+* break from wait loops if EC2 instance is terminated [Anton Belodedenko]
+
+# v4.1.4
+## (2024-06-25)
+
+* show EC2 instance termination status [Anton Belodedenko]
+
+# v4.1.3
+## (2024-06-25)
+
+* Update actions/checkout digest to 692973e [Self-hosted Renovate Bot]
+
+# v4.1.2
+## (2024-06-24)
+
+* fail early on EC2 instance termination (i.e. spot capacity) [Anton Belodedenko]
+
+# v4.1.1
+## (2024-06-24)
+
+* Pin unfor19/install-aws-cli-action action to e8b481e [Self-hosted Renovate Bot]
+
+# v4.1.0
+## (2024-06-24)
+
+* test compose workflow [Anton Belodedenko]
+
+# v4.0.57
+## (2024-06-24)
+
+* Update balena/open-balena-api Docker tag to v25.1.7 [Self-hosted Renovate Bot]
+
+# v4.0.56
+## (2024-06-24)
+
+* Update balena/open-balena-api Docker tag to v25.1.6 [Self-hosted Renovate Bot]
+
+# v4.0.55
+## (2024-06-24)
+
+* Update balena/open-balena-api Docker tag to v25.1.5 [Self-hosted Renovate Bot]
+
+# v4.0.54
+## (2024-06-21)
+
+* Update dependency balena-io/balena-cli to v18.2.10 [Self-hosted Renovate Bot]
+
+# v4.0.53
+## (2024-06-21)
+
+* Update dependency balena-io/balena-cli to v18.2.9 [Self-hosted Renovate Bot]
+
+# v4.0.52
+## (2024-06-21)
+
+* Update dependency balena-io/balena-cli to v18.2.8 [Self-hosted Renovate Bot]
+
+# v4.0.51
+## (2024-06-21)
+
+* Update dependency balena-io/balena-cli to v18.2.7 [Self-hosted Renovate Bot]
+
+# v4.0.50
+## (2024-06-21)
+
+* Update dependency balena-io/balena-cli to v18.2.6 [Self-hosted Renovate Bot]
+
+# v4.0.49
+## (2024-06-21)
+
+* Update dependency balena-io/balena-cli to v18.2.5 [Self-hosted Renovate Bot]
+
+# v4.0.48
+## (2024-06-19)
+
+* Update balena/open-balena-api Docker tag to v25.1.3 [Self-hosted Renovate Bot]
+
+# v4.0.47
+## (2024-06-19)
+
+* Update balena/open-balena-api Docker tag to v25.1.2 [Self-hosted Renovate Bot]
+
+# v4.0.46
+## (2024-06-18)
+
+* Update balena/open-balena-api Docker tag to v25.1.1 [Self-hosted Renovate Bot]
+
+# v4.0.45
+## (2024-06-18)
+
+* Update aws-actions/configure-aws-credentials digest to 61a1105 [Self-hosted Renovate Bot]
+
+# v4.0.44
+## (2024-06-17)
+
+* Update balena/open-balena-api Docker tag to v25.1.0 [Self-hosted Renovate Bot]
+
+# v4.0.43
+## (2024-06-17)
+
+* Update balena/open-balena-api Docker tag to v25 [Self-hosted Renovate Bot]
+
+# v4.0.42
+## (2024-06-13)
+
+* Update qemux/qemu-docker Docker tag to v5.16 [Self-hosted Renovate Bot]
+
+# v4.0.41
+## (2024-06-12)
+
+* Update qemux/qemu-docker Docker tag to v5.15 [Self-hosted Renovate Bot]
+
+# v4.0.40
+## (2024-06-12)
+
+* Update actions/checkout digest to 692973e [Self-hosted Renovate Bot]
+
+# v4.0.39
+## (2024-06-12)
+
+* Update actions/checkout digest to 6ccd57f [Self-hosted Renovate Bot]
+
+# v4.0.38
+## (2024-06-12)
+
+* Update actions/checkout digest to b17fe1e [Self-hosted Renovate Bot]
+
+# v4.0.37
+## (2024-06-12)
+
+* Update qemux/qemu-docker Docker tag to v5.14 [Self-hosted Renovate Bot]
+
+# v4.0.36
+## (2024-06-12)
+
+* Update balena/open-balena-s3 Docker tag to v2.28.45 [Self-hosted Renovate Bot]
+
+# v4.0.35
+## (2024-06-11)
+
+* Update balena/open-balena-api Docker tag to v24.3.1 [Self-hosted Renovate Bot]
+
+# v4.0.34
+## (2024-06-11)
+
+* Update balena/open-balena-registry Docker tag to v2.39.58 [Self-hosted Renovate Bot]
+
+# v4.0.33
+## (2024-06-11)
+
+* Update balena/open-balena-api Docker tag to v24.3.0 [Self-hosted Renovate Bot]
+
+# v4.0.32
+## (2024-06-11)
+
+* Update balena/open-balena-api Docker tag to v24.2.2 [Self-hosted Renovate Bot]
+
+# v4.0.31
+## (2024-06-11)
+
+* Update aws-actions/configure-aws-credentials digest to c7680c3 [Self-hosted Renovate Bot]
+
+# v4.0.30
+## (2024-06-11)
+
+* Update aws-actions/configure-aws-credentials digest to cf3f053 [Self-hosted Renovate Bot]
+
+# v4.0.29
+## (2024-06-11)
+
+* Update qemux/qemu-docker Docker tag to v5.13 [Self-hosted Renovate Bot]
+
+# v4.0.28
+## (2024-06-10)
+
+* Update balena/open-balena-api Docker tag to v24.2.1 [Self-hosted Renovate Bot]
+
+# v4.0.27
+## (2024-06-10)
+
+* ignore .env if it doesn't exist [Anton Belodedenko]
+
+# v4.0.26
+## (2024-06-10)
+
+* Update balena/open-balena-api Docker tag to v24.2.0 [Self-hosted Renovate Bot]
+
+# v4.0.25
+## (2024-06-10)
+
+* Update balena/open-balena-api Docker tag to v24.1.3 [Self-hosted Renovate Bot]
+
+# v4.0.24
+## (2024-06-09)
+
+* backoff retry device registrations and tagging [Anton Belodedenko]
+
+# v4.0.23
+## (2024-06-09)
+
+* Update qemux/qemu-docker Docker tag to v5.12 [Self-hosted Renovate Bot]
+
+# v4.0.22
+## (2024-06-07)
+
+* Update balena/open-balena-api Docker tag to v24.1.2 [Self-hosted Renovate Bot]
+
+# v4.0.21
+## (2024-06-06)
+
+* Update balena/open-balena-api Docker tag to v24 [Self-hosted Renovate Bot]
+
+# v4.0.20
+## (2024-06-06)
+
+* Update balena/open-balena-api Docker tag to v23.3.0 [Self-hosted Renovate Bot]
+
+# v4.0.19
+## (2024-06-05)
+
+* Update balena/open-balena-api Docker tag to v23.2.0 [Self-hosted Renovate Bot]
+
+# v4.0.18
+## (2024-06-05)
+
+* Update qemux/qemu-docker Docker tag to v5.11 [Self-hosted Renovate Bot]
+
+# v4.0.17
+## (2024-06-04)
+
+* Update balena/open-balena-api Docker tag to v23.1.0 [Self-hosted Renovate Bot]
+
+# v4.0.16
+## (2024-06-04)
+
+* Update balena/open-balena-api Docker tag to v23.0.2 [Self-hosted Renovate Bot]
+
+# v4.0.15
+## (2024-06-04)
+
+* Update aws-actions/configure-aws-credentials digest to bd07581 [Self-hosted Renovate Bot]
+
+# v4.0.14
+## (2024-06-02)
+
+* Update qemux/qemu-docker Docker tag to v5.10 [Self-hosted Renovate Bot]
+
+# v4.0.13
+## (2024-05-30)
+
+* Update ubuntu Docker tag to v24 [Self-hosted Renovate Bot]
+
+# v4.0.12
+## (2024-05-30)
+
+* Update qemux/qemu-docker Docker tag to v5 [Self-hosted Renovate Bot]
+
+# v4.0.11
+## (2024-05-30)
+
+* Update balena/open-balena-registry Docker tag to v2.39.57 [Self-hosted Renovate Bot]
+
+# v4.0.10
+## (2024-05-30)
+
+* Update balena/open-balena-s3 Docker tag to v2.28.44 [Self-hosted Renovate Bot]
+
+# v4.0.9
+## (2024-05-30)
+
+* Update balena/open-balena-api Docker tag to v23 [Self-hosted Renovate Bot]
+
+# v4.0.8
+## (2024-05-29)
+
+* Update balena/open-balena-vpn Docker tag to v11.30.22 [Self-hosted Renovate Bot]
+
+# v4.0.7
+## (2024-05-29)
+
+* Update qemux/qemu-docker Docker tag to v4.28 [Self-hosted Renovate Bot]
+
+# v4.0.6
+## (2024-05-29)
+
+* Update balena/open-balena-s3 Docker tag to v2.28.43 [Self-hosted Renovate Bot]
+
+# v4.0.5
+## (2024-05-29)
+
+* Update balena/open-balena-haproxy Docker tag to v4.3.2 [Self-hosted Renovate Bot]
+
+# v4.0.4
+## (2024-05-29)
+
+* Update balena/open-balena-registry Docker tag to v2.39.56 [Self-hosted Renovate Bot]
+
+# v4.0.3
+## (2024-05-29)
+
+* Update aws-actions/configure-aws-credentials digest to 43c8912 [Self-hosted Renovate Bot]
+
 # v4.0.2
 ## (2024-05-28)
 

Makefile

@@ -3,15 +3,17 @@ SHELL := bash
 # export all variables to child processes by default
 export
 
-# Include the .env file
-include .env
+# include the .env file if it exists
+-include .env
 
+BALENARC_NO_ANALYTICS ?= 1
 DNS_TLD ?= $(error DNS_TLD not set)
-TMPKI := $(shell mktemp)
-STAGING_PKI ?= /usr/local/share/ca-certificates
-PRODUCTION_MODE ?= true
 ORG_UNIT ?= openBalena
+PRODUCTION_MODE ?= true
+STAGING_PKI ?= /usr/local/share/ca-certificates
 SUPERUSER_EMAIL ?= admin@$(DNS_TLD)
+TMPKI := $(shell mktemp)
+VERBOSE ?= false
 
 .NOTPARALLEL: $(DOCKERCOMPOSE)
 
@@ -39,23 +41,45 @@ ifneq ($(GANDI_API_TOKEN),)
 endif
 endif
 	@rm -f .env
+	@echo "BALENARC_NO_ANALYTICS=$(BALENARC_NO_ANALYTICS)" > .env
 	@echo "DNS_TLD=$(DNS_TLD)" >> .env
 	@echo "ORG_UNIT=$(ORG_UNIT)" >> .env
-	@echo "SUPERUSER_EMAIL=$(SUPERUSER_EMAIL)" >> .env
 	@echo "PRODUCTION_MODE=$(PRODUCTION_MODE)" >> .env
-	@echo "GANDI_API_TOKEN=$(GANDI_API_TOKEN)" >> .env
-	@echo "CLOUDFLARE_API_TOKEN=$(CLOUDFLARE_API_TOKEN)" >> .env
+	@echo "SUPERUSER_EMAIL=$(SUPERUSER_EMAIL)" >> .env
+	@echo "VERBOSE=$(VERBOSE)" >> .env
+ifneq ($(ACME_EMAIL),)
 	@echo "ACME_EMAIL=$(ACME_EMAIL)" >> .env
+endif
+ifneq ($(CLOUDFLARE_API_TOKEN),)
+	@echo "CLOUDFLARE_API_TOKEN=$(CLOUDFLARE_API_TOKEN)" >> .env
+endif
+ifneq ($(GANDI_API_TOKEN),)
+	@echo "GANDI_API_TOKEN=$(GANDI_API_TOKEN)" >> .env
+endif
+ifneq ($(HAPROXY_CRT),)
 	@echo "HAPROXY_CRT=$(HAPROXY_CRT)" >> .env
+endif
+ifneq ($(HAPROXY_KEY),)
 	@echo "HAPROXY_KEY=$(HAPROXY_KEY)" >> .env
+endif
+ifneq ($(ROOT_CA),)
 	@echo "ROOT_CA=$(ROOT_CA)" >> .env
+endif
 	@$(MAKE) showenv
 
+.PHONY: wait
+wait: ## Wait for service
+	@until [[ $$(docker compose ps $(SERVICE) --format json | jq -r '.Health') =~ ^healthy$$ ]]; do printf '.'; sleep 3; done
+	@printf '\n'
+
+.PHONY: waitlog
+waitlog: ## Wait for log line
+	@until docker compose logs $(SERVICE) | grep -Eq "$(LOG_STRING)"; do printf '.'; sleep 3; done
+
 .PHONY: up
 up: config ## Start all services
 	@docker compose up --build -d
-	@until [[ $$(docker compose ps api --format json | jq -r '.Health') =~ healthy ]]; do printf '.'; sleep 3; done
-	@printf '\n'
+	@$(MAKE) wait SERVICE=api
 	@$(MAKE) showenv
 	@$(MAKE) showpass
 
@@ -83,6 +107,7 @@ stop: down ## Alias for 'make down'
 .PHONY: restart
 restart: ## Restart all services
 	@docker compose restart
+	@$(MAKE) wait SERVICE=api
 
 .PHONY: update
 update: # Pull and deploy latest changes from git
@@ -118,11 +143,10 @@ self-signed: ## Install self-signed CA certificates
 auto-pki: config # Start all services using LetsEncrypt and ACME
 	@docker compose exec cert-manager rm -f /certs/export/chain.pem
 	@docker compose up -d
-	@until docker compose logs cert-manager | grep -Eq "/certs/export/chain.pem Certificate will not expire in [0-9] days"; do printf '.'; sleep 3; done
-	@until docker compose logs cert-manager | grep -q "subject=CN = ${DNS_TLD}"; do printf '.'; sleep 3; done
-	@until docker compose logs cert-manager | grep -q "issuer=C = US, O = Let's Encrypt, CN = R3"; do printf '.'; sleep 3; done
-	@until [[ $$(docker compose ps haproxy --format json | jq -r '.Health') =~ healthy ]]; do printf '.'; sleep 3; done
-	@printf '\n'
+	@$(MAKE) waitlog SERVICE=cert-manager LOG_STRING="/certs/export/chain.pem Certificate will not expire in [0-9] days"
+	@$(MAKE) waitlog SERVICE=cert-manager LOG_STRING="subject=CN = ${DNS_TLD}"
+	@$(MAKE) waitlog SERVICE=cert-manager LOG_STRING="issuer=C = US, O = Let's Encrypt, CN = .*"
+	@$(MAKE) wait SERVICE=haproxy
 	@$(MAKE) showenv
 	@$(MAKE) showpass
 

VERSION

@@ -1 +1 @@
-4.0.2
+4.1.37

balena.yml

@@ -23,4 +23,4 @@ data:
     - generic-amd64
     - genericx86-64-ext
     - intel-nuc
-version: 4.0.2
+version: 4.1.37

docker-compose.yml

@@ -64,11 +64,11 @@ x-network-privileges-trait: &with-network-privileges
     - SYS_RESOURCE
 
 x-base-service-definition: &base-service
-  restart: unless-stopped
+  restart: 'unless-stopped'
   # for docker-compose only, no effect on balenaCloud
   env_file:
     - .env
-  tty: 'true'  # send syastemd logs from containers to stdout
+  tty: true  # send syastemd logs from containers to stdout
 
 services:
   # https://github.com/balena-io/open-balena-api
@@ -79,7 +79,7 @@ services:
       *with-default-privileges,
       *with-default-volumes,
     ]
-    image: balena/open-balena-api:v22.2.3
+    image: balena/open-balena-api:v25.2.5
     depends_on:
       - db
       - redis
@@ -110,7 +110,7 @@ services:
       TRUST_PROXY: 172.16.0.0/12
       VPN_PORT: 443
       WEBRESOURCES_S3_BUCKET: web-resources
-      WEBRESOURCES_S3_REGION: "us-east-1"  # this is required for minio
+      WEBRESOURCES_S3_REGION: 'us-east-1'  # this is required for minio
 
   # https://github.com/balena-io/open-balena-registry
   registry:
@@ -119,7 +119,7 @@ services:
       *with-default-healthcheck,
       *with-default-privileges,
     ]
-    image: balena/open-balena-registry:v2.39.55
+    image: balena/open-balena-registry:v2.39.62
     volumes:
       - certs-data:/certs
       - resin-data:/balena
@@ -146,7 +146,7 @@ services:
       *with-network-privileges,
       *with-default-privileges,
     ]
-    image: balena/open-balena-vpn:v11.30.9
+    image: balena/open-balena-vpn:v11.30.26
     depends_on:
       - api
     environment:
@@ -175,7 +175,7 @@ services:
       *with-default-healthcheck,
       *with-default-privileges,
     ]
-    image: balena/open-balena-s3:v2.28.42
+    image: balena/open-balena-s3:v2.28.49
     volumes:
       - s3-data:/export
       - certs-data:/certs
@@ -212,11 +212,11 @@ services:
       test: true | openssl s_client -connect localhost:443
     ports:
       # haproxy/http
-      - "80:80/tcp"
+      - '80:80/tcp'
       # haproxy/tcp-router
-      - "443:443/tcp"
+      - '443:443/tcp'
       # haproxy/stats
-      - "1936:1936/tcp"
+      - '1936:1936/tcp'
     environment:
       LOGLEVEL: info
 
@@ -281,7 +281,7 @@ services:
   # only relevant when running in AWS/EC2
   tag-sidecar:
     build: src/tag-sidecar
-    restart: no
+    restart: 'no'
     environment:
       ENABLED: 'true'
     labels:
@@ -308,7 +308,7 @@ services:
     labels:
       io.balena.features.balena-api: 1
       io.balena.features.supervisor-api: 1
-    restart: no
+    restart: 'no'
 
   # virtual Device Under Test (DUT)
   dut:
@@ -333,7 +333,7 @@ services:
       - resin-data:/balena
     devices:
       - /dev/net/tun
-    restart: no
+    restart: 'no'
 
   # https://hub.docker.com/_/docker
   # pseudo(builder) service for balena-tests
@@ -344,11 +344,23 @@ services:
       *with-network-privileges,
     ]
     image: docker:dind
+    entrypoint:
+      - /bin/sh
+      - -c
+    command:
+      - |
+        set -x
+
+        cp /certs/root-ca.pem /certs/server-ca.pem /usr/local/share/ca-certificates/ \
+          && update-ca-certificates
+
+        exec /usr/local/bin/dockerd-entrypoint.sh
     volumes:
-      - builder-data:/var/lib/docker
+      - /sys:/sys
       - builder-certs-ca:/docker-pki/ca
       - builder-certs-client:/docker-pki/client
-      - /sys:/sys
+      - builder-data:/var/lib/docker
+      - certs-data:/certs
     environment:
       DOCKER_TLS_CERTDIR: /docker-pki
     healthcheck:

docs/getting-started.md

@@ -82,7 +82,7 @@ name and configure records.
 
     ```bash
     sudo useradd -s /bin/bash -m -G docker,sudo balena
-    echo 'balena ALL=(ALL) NOPASSWD: ALL' | tee >/etc/sudoers.d/balena
+    echo 'balena ALL=(ALL) NOPASSWD: ALL' | sudo tee /etc/sudoers.d/balena
     ```
 
 6. Switch user:

src/balena-tests/Dockerfile

@@ -1,7 +1,7 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 # renovate: datasource=github-releases depName=balena-io/balena-cli
-ARG BALENA_CLI_VERSION=v18.2.2
+ARG BALENA_CLI_VERSION=v18.2.29
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 	bash \

src/balena-tests/balena.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # shellcheck disable=SC2154,SC2034,SC1090
-set -ae
+set -aeu
 
 curl_opts="--retry 3 --fail"
 if [[ $VERBOSE =~ on|On|Yes|yes|true|True ]]; then
@@ -17,7 +17,7 @@ function remove_test_assets() {
     rm -rf /balena/config.json \
       "${GUEST_IMAGE}" \
       "${GUEST_IMAGE%.*}.ready" \
-      "${tmpbuild}" \
+      "${tmpbuild:-}" \
       /tmp/*.img
 }
 
@@ -39,14 +39,16 @@ function shutdown_dut() {
     local balena_device_uuid
     balena_device_uuid="$(cat </balena/config.json | jq -r .uuid)"
 
-    if [[ -n $balena_device_uuid ]]; then
+    if [[ -n "${balena_device_uuid:-}" ]]; then
         with_backoff balena device "${balena_device_uuid}"
-        balena device shutdown -f "${balena_device_uuid}" || true
+        if ! with_backoff balena device shutdown -f "${balena_device_uuid}"; then
+            echo 'DUT failed to shutdown properly'
+        fi
     fi
 }
 
 function set_update_lock {
-    if [[ -n "$BALENA_SUPERVISOR_ADDRESS" ]] && [[ -n "$BALENA_SUPERVISOR_API_KEY" ]]; then
+    if [[ -n "${BALENA_SUPERVISOR_ADDRESS:-}" ]] && [[ -n "${BALENA_SUPERVISOR_API_KEY:-}" ]]; then
         while [[ $(curl ${curl_opts} "${BALENA_SUPERVISOR_ADDRESS}/v1/device?apikey=${BALENA_SUPERVISOR_API_KEY}" \
           -H "Content-Type: application/json" | jq -r '.update_pending') == 'true' ]]; do
 
@@ -88,6 +90,7 @@ function update_ca_certificates() {
 
 function wait_for_api() {
     while ! curl ${curl_opts} "https://api.${DNS_TLD}/ping"; do
+        echo 'waiting for API...'
         sleep "$(( (RANDOM % 5) + 5 ))s"
     done
 }
@@ -96,6 +99,7 @@ function open_balena_login() {
     while ! balena login --credentials \
       --email "${SUPERUSER_EMAIL}" \
       --password "${SUPERUSER_PASSWORD}"; do
+        echo 'waiting for auth...'
         sleep "$(( (RANDOM % 5) + 5 ))s"
     done
 }
@@ -104,6 +108,7 @@ function create_fleet() {
     if ! balena fleet "${TEST_FLEET}"; then
         # wait for API to load DT contracts
         while ! balena fleet create "${TEST_FLEET}" --type "${DEVICE_TYPE}"; do
+            echo 'waiting for device types...'
             sleep "$(( (RANDOM % 5) + 5 ))s"
         done
 
@@ -175,7 +180,7 @@ function wait_for_device() {
 }
 
 function registry_auth() {
-    if [[ -n $REGISTRY_USER ]] && [[ -n $REGISTRY_PASS ]]; then
+    if [[ -n "${REGISTRY_USER:-}" ]] && [[ -n "${REGISTRY_PASS:-}" ]]; then
         with_backoff docker login -u "${REGISTRY_USER}" -p "${REGISTRY_PASS}"
 
         printf '{"https://index.docker.io/v1/": {"username":"%s", "password":"$s"}}' \
@@ -224,7 +229,7 @@ function supervisor_update_target_state() {
     local balena_device_uuid
     balena_device_uuid="$(cat </balena/config.json | jq -r .uuid)"
 
-    if [[ -n $balena_device_uuid ]]; then
+    if [[ -n "${balena_device_uuid:-}" ]]; then
         while ! curl ${curl_opts} "https://api.${DNS_TLD}/supervisor/v1/update" \
           --header "Content-Type: application/json" \
           --header "Authorization: Bearer $(cat <~/.balena/token)" \
@@ -241,14 +246,14 @@ function check_running_release() {
 
     local should_be_running_release
     should_be_running_release="$(get_release_commit)"
-    [[ -z $should_be_running_release ]] && false
+    [[ -z "$should_be_running_release" ]] && false
 
-    if [[ -n $balena_device_uuid ]]; then
+    if [[ -n "${balena_device_uuid:-}" ]]; then
         while ! [[ $(balena device "${balena_device_uuid}" | grep -E ^COMMIT | awk '{print $2}') =~ ${should_be_running_release} ]]; do
             running_release_id="$(balena device "${balena_device_uuid}" | grep -E ^COMMIT | awk '{print $2}')"
             printf 'please wait, device %s should be running %s, but is still running %s...\n' \
               "${balena_device_uuid}" \
-              "${1}" \
+              "${should_be_running_release}" \
               "${running_release_id}"
 
             sleep "$(( (RANDOM % 5) + 5 ))s"
@@ -266,7 +271,7 @@ function get_os_version() {
 }
 
 function upload_release_asset() {
-    if [[ "$RELEASE_ASSETS_TEST" =~ true ]]; then
+    if [[ "${RELEASE_ASSETS_T:-}" =~ true ]]; then
         local release_id
         release_id=${1:-1}
         release_asset="$(find / -type f -name '*.png' | head -n 1)"
@@ -282,11 +287,11 @@ function upload_release_asset() {
 }
 
 # --- main
-if [[ "$PRODUCTION_MODE" =~ true ]]; then
+if [[ "${PRODUCTION_MODE:-}" =~ true ]]; then
     exit
 fi
 
-if [[ -n "${BALENA_DEVICE_UUID}" ]]; then
+if [[ -n "${BALENA_DEVICE_UUID:-}" ]]; then
     # prepend the device UUID if running on balenaOS
     TLD="${BALENA_DEVICE_UUID}.${DNS_TLD}"
 else
@@ -303,7 +308,19 @@ GUEST_IMAGE=${GUEST_IMAGE:-/balena/balena.img}
 OS_VERSION="$(get_os_version)"
 TEST_FLEET=${TEST_FLEET:-test-fleet}
 
-[[ -f "$CONF" ]] && source "${CONF}"
+# wait here until global config is ready
+until [[ -s "$CONF" ]]; do
+    echo 'waiting for config...'
+    sleep "$(( (RANDOM % 5) + 5 ))s"
+done
+source "${CONF}"
+
+# wait her until we have valid login credentials
+until [[ -n "${SUPERUSER_EMAIL:-}" ]] && [[ -n "${SUPERUSER_PASSWORD:-}" ]]; do
+    echo 'waiting for credentials...'
+    sleep "$(( (RANDOM % 5) + 5 ))s"
+    source "${CONF}"
+done
 
 update_ca_certificates  # ensure self-signed root CA certificate(s) trust
 

src/haproxy/Dockerfile

@@ -1,4 +1,4 @@
 # https://github.com/balena-io/open-balena-haproxy
-FROM balena/open-balena-haproxy:v4.3.1
+FROM balena/open-balena-haproxy:v4.3.2
 
 COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg

src/test-device/Dockerfile

@@ -1,6 +1,6 @@
 # https://hub.docker.com/r/qemux/qemu-docker
 # https://github.com/qemus/qemu-docker
-FROM qemux/qemu-docker:4.24
+FROM qemux/qemu-docker:5.16
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
 	minicom \