From 06c3f488e5703c37b110ed5554ff06c9506332fc Mon Sep 17 00:00:00 2001
From: Balena CI <34882892+balena-ci@users.noreply.github.com>
Date: Mon, 26 Jul 2021 17:05:14 +0300
Subject: [PATCH] v12.9.6

---
 .versionbot/CHANGELOG.yml | 53 +++++++++++++++++++++++++++++++++++++++
 CHANGELOG.md              |  5 ++++
 VERSION                   |  2 +-
 package-lock.json         |  2 +-
 package.json              |  4 +--
 5 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index 2fe8709e..01cc208a 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,56 @@
+- commits:
+    - subject: Use tags to track supervised images in docker
+      hash: f1bd4b8d9bcef29e326cbf97eaddd837c2704d19
+      body: >
+        The image manager module now uses tags instead of docker IDs as the main
+
+        way to identify docker images on the engine. That is, if the target
+
+        state image has a name `imageName:tag@digest`, the supervisor will
+        always use
+
+        the given `imageName` and `tag` (which may be empty) to tag the image on
+
+        the engine after fetching. This PR also adds checkups to ensure
+
+        consistency is maintained between the database and the engine.
+
+
+        Using tags allows to simplify query and removal operations, since now
+
+        removing the image now means removing tags matching the image name.
+
+
+        Before this change the supervisor relied only on information in the
+
+        supervisor database, and used that to remove images by docker ID.
+        However, the docker
+
+        id is not a reliable identifier, since images retain the same id between
+
+        releases or between services in the same release.
+
+
+        List of squashed commits
+
+        - Remove custom type NormalizedImageInfo
+
+        - Remove dependency on docker-toolbelt
+
+        - Use tags to traack supervised images in docker
+
+        - Ensure tag removal occurs in sequence
+
+        - Only save database image after download confirmed
+      footer:
+        Relates-to: '#1616 #1579'
+        relates-to: '#1616 #1579'
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+  version: 12.9.6
+  date: 2021-07-26T13:58:29.275Z
 - commits:
     - subject: Log the delta URL that will be downloaded on update
       hash: c05c5803f08ddd31eeddb2000cc5f162fb916003
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a29e1381..57ef6ce3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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/).
 
+# v12.9.6
+## (2021-07-26)
+
+* Use tags to track supervised images in docker [Felipe Lalanne]
+
 # v12.9.5
 ## (2021-07-22)
 
diff --git a/VERSION b/VERSION
index 1a5d5efa..0a67eb69 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.9.5
\ No newline at end of file
+12.9.6
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 05e12a36..5a75c94b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "12.9.5",
+  "version": "12.9.6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 522e4a8c..3c0f370d 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": "12.9.5",
+  "version": "12.9.6",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -138,6 +138,6 @@
     }
   },
   "versionist": {
-    "publishedAt": "2021-07-22T15:08:58.689Z"
+    "publishedAt": "2021-07-26T13:58:29.461Z"
   }
 }