From 5cbd1149f197dc62990178933dd7d742e71ae437 Mon Sep 17 00:00:00 2001
From: "flowzone-app[bot]"
 <124931076+flowzone-app[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 20:53:38 +0000
Subject: [PATCH] v14.11.6

---
 .versionbot/CHANGELOG.yml | 36 ++++++++++++++++++++++++++++++++++++
 CHANGELOG.md              |  6 ++++++
 VERSION                   |  2 +-
 balena.yml                |  2 +-
 package-lock.json         |  4 ++--
 package.json              |  4 ++--
 6 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index e7b864b1..3a94555e 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,39 @@
+- commits:
+    - subject: Add fail-safe to test the image architecture
+      hash: 1cf325d5c55bfb9d2ebb4cde7b9c448a6cfb2067
+      body: |
+        Verify that the target image architecture matches what is expected
+        according to the balena app architecture.
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+    - subject: Use multi-arch in dockerfile
+      hash: c1b157971d5fe15f9b85cdc6f0eed90b8d2eb22f
+      body: >
+        This is necessary since the builder no longer passes the platform flag
+
+        to the build. This would lead to dockerfiles that are mixing multi and single
+
+        arch stages to pull the wrong architecture images, particularly when
+
+        trying to build images in emulated builds (e.g. armv7hf built on aarch64).
+
+
+        Moving the full build to multi-arch solves this as the docker engine is
+
+        capable of chosing the right architecture from the manifest.
+      footer:
+        Relatest-to: balena-io/balena-builder#1010
+        relatest-to: balena-io/balena-builder#1010
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+  version: 14.11.6
+  title: ""
+  date: 2023-06-19T20:53:34.395Z
 - commits:
     - subject: Improve tests surrounding Engine-host race patch
       hash: 7eba48f8b832ec16465565f210e659a9f822e5b3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e25d804..bd9ac6c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ 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/).
 
+# v14.11.6
+## (2023-06-19)
+
+* Add fail-safe to test the image architecture [Felipe Lalanne]
+* Use multi-arch in dockerfile [Felipe Lalanne]
+
 # v14.11.5
 ## (2023-06-19)
 
diff --git a/VERSION b/VERSION
index 7faae47d..08b5f531 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-14.11.5
\ No newline at end of file
+14.11.6
\ No newline at end of file
diff --git a/balena.yml b/balena.yml
index 808b0cf9..aab6a180 100644
--- a/balena.yml
+++ b/balena.yml
@@ -2,6 +2,6 @@ name: balena-supervisor
 description: 'Balena Supervisor: balena''s agent on devices.'
 joinable: false
 type: sw.application
-version: 14.11.5
+version: 14.11.6
 provides:
   - slug: sw.compose.long-volume-syntax
diff --git a/package-lock.json b/package-lock.json
index fdbd3f68..a9cda105 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "balena-supervisor",
-  "version": "14.11.5",
+  "version": "14.11.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "balena-supervisor",
-      "version": "14.11.5",
+      "version": "14.11.6",
       "license": "Apache-2.0",
       "dependencies": {
         "@balena/happy-eyeballs": "0.0.6",
diff --git a/package.json b/package.json
index 22186817..bc059946 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "balena-supervisor",
   "description": "This is balena's Supervisor, a program that runs on IoT devices and has the task of running user Apps (which are Docker containers), and updating them as the balena API informs it to.",
-  "version": "14.11.5",
+  "version": "14.11.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -146,6 +146,6 @@
     }
   },
   "versionist": {
-    "publishedAt": "2023-06-19T19:01:20.075Z"
+    "publishedAt": "2023-06-19T20:53:35.200Z"
   }
 }