From d19e63d38fbab7bdcc39f5fe41cec71f3dc9fc28 Mon Sep 17 00:00:00 2001 From: Resin CI <34882892+resin-ci@users.noreply.github.com> Date: Mon, 11 Feb 2019 11:05:10 +0100 Subject: [PATCH] v9.7.2 --- .versionbot/CHANGELOG.yml | 23 +++++++++++++++++++++++ CHANGELOG.md | 4 ++++ package.json | 2 +- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index db4a4a19..0352ed07 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,26 @@ +- commits: + - subject: 'fix: Normalize ports from compose file on instantiation' + hash: f3264862ca73e9b059da7fa7ce19aa67bfb9c296 + body: | + Adjacent ports are always grouped together by docker when reporting the + container state (from an inspect), so adjacent ports defined in the + compose file would not match as they would not have been normalized. + + We make sure to always normalize the input port configuration, so that + it will match the docker output (if it should). + + We also don't sort in the fromComposePorts function anymore as that is + handled by the normalize function. + footer: + Closes: '#897' + closes: '#897' + Change-type: patch + change-type: patch + Signed-off-by: Cameron Diver + signed-off-by: Cameron Diver + author: Cameron Diver + version: 9.7.2 + date: 2019-02-09T21:43:47.044Z - commits: - subject: 'fix: Rework delete-then-download handling in state engine' hash: e9b51bbcd741fd65851190e73428d00ab18f7443 diff --git a/CHANGELOG.md b/CHANGELOG.md index dfd40c03..1c24bc2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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/). +## 9.7.2 - 2019-02-09 + +* Fix: Normalize ports from compose file on instantiation [Cameron Diver] + ## 9.7.1 - 2019-02-06 * Fix: Rework delete-then-download handling in state engine [Cameron Diver] diff --git a/package.json b/package.json index 79f3427b..26809dab 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": "9.7.1", + "version": "9.7.2", "license": "Apache-2.0", "repository": { "type": "git",