From 2615c25fc48d4e40cf6ec8ecf567621bd261e9f0 Mon Sep 17 00:00:00 2001
From: Balena CI <34882892+balena-ci@users.noreply.github.com>
Date: Thu, 24 Feb 2022 15:32:47 +0200
Subject: [PATCH] v12.11.36

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

diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
index f0a3dbbc..995ae40c 100644
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,29 @@
+- commits:
+    - subject: Ignore selinux security opts when comparing services
+      hash: 1b54ce8bfd5dd3d1f14f573a0bfe17ee1dd81630
+      body: >
+        The moby engine v20.x.y adds some selinux [security
+        configurations](https://docs.docker.com/engine/reference/run/#security-configuration)
+
+        depending on the [container configuration](https://github.com/moby/moby/blob/master/daemon/create.go#L214).
+
+        This would cause the supervisor to enter a service restart loop as the
+
+        current and target service configurations will never match. The
+
+        supervisor now ignores selinux specific security options since those are
+
+        not supported by balenaOS.
+      footer:
+        Closes: "#1890"
+        closes: "#1890"
+        Change-type: patch
+        change-type: patch
+      author: Felipe Lalanne
+      nested: []
+  version: 12.11.36
+  title: "'Ignore selinux security opts when comparing services'"
+  date: 2022-02-23T21:15:31.484Z
 - commits:
     - subject: Add troubleshooting notice for macOS
       hash: 6ab314f8c0af647cdb0537b6a396ccb3d5ce060f
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8acdb5dd..36f74bd9 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.11.36
+## (2022-02-23)
+
+* Ignore selinux security opts when comparing services [Felipe Lalanne]
+
 # v12.11.35
 ## (2022-02-16)
 
diff --git a/VERSION b/VERSION
index d2defbea..1c40c989 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-12.11.35
\ No newline at end of file
+12.11.36
\ No newline at end of file
diff --git a/balena.yml b/balena.yml
index 29e22170..0e63d2c2 100644
--- a/balena.yml
+++ b/balena.yml
@@ -2,4 +2,4 @@ name: balena-supervisor
 description: 'Balena Supervisor: balena''s agent on devices.'
 joinable: false
 type: sw.application
-version: 12.11.35
+version: 12.11.36
diff --git a/package-lock.json b/package-lock.json
index 3ef10ce9..d4811e61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "balena-supervisor",
-  "version": "12.11.35",
+  "version": "12.11.36",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d84623c4..f65e0afa 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.11.35",
+  "version": "12.11.36",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -139,6 +139,6 @@
     }
   },
   "versionist": {
-    "publishedAt": "2022-02-16T19:41:23.092Z"
+    "publishedAt": "2022-02-23T21:15:32.087Z"
   }
 }