From d08787902a538e1f05c837396b0bef7435752a82 Mon Sep 17 00:00:00 2001
From: Raj Chaudhuri <rajch@hotmail.com>
Date: Fri, 8 Mar 2024 00:03:10 +0530
Subject: [PATCH] Add release v2.8.3

---
 CHANGELOG.md            |  6 ++++++
 reweave/CHANGELOG.md    | 11 ++++++++++-
 reweave/Makefile        |  2 +-
 reweave/scans/report.md |  4 ++--
 weave                   |  1 +
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 586dcec9..ea7f454b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## Release 2.8.3
+
+The docker API client version, used by the proxy package and the weaveutil command, was bumped from 1.18 to 1.24. As of March 2024, Docker API versions below 1.24 are deprecated. This means that the minimum supported Docker version is now 1.12.0.
+
+Provision was made in weaveutil program and the weave script to override the API version used, via the environment variable `DOCKER_API_VERSION`. The same variable is used by standard docker clients.
+
 ## Release 2.8.2
 
 This is the first release since forking from weaveworks/weave. While no new functionality has been added, there have been many changes.
diff --git a/reweave/CHANGELOG.md b/reweave/CHANGELOG.md
index b2aa6fa5..852a539e 100644
--- a/reweave/CHANGELOG.md
+++ b/reweave/CHANGELOG.md
@@ -2,11 +2,20 @@
 
 All changes made to the weave net codebase during the reweave effort will be documented in this file.
 
-## latest
+## 2.8.3
+
+### Changed
+
+* Changed version in `reweave/Makefile` to 2.8.3
+* Modified reweave and main CHANGELOG.md
+* Modified the `weave` script
+
+## 2.8.3-beta1 (a752f656)
 
 ### Changed
 
 * The docker API client version, used by the proxy package and the weaveutil command, was bumped from 1.18 to 1.24. As of March 2024, Docker API versions below 1.24 are deprecated. This means that the minimum supported Docker version is now 1.12.0
+* The scan report now scans all images other than the V2 Docker plugin
 
 ### Added
 
diff --git a/reweave/Makefile b/reweave/Makefile
index 3edb4e11..2fd0c156 100644
--- a/reweave/Makefile
+++ b/reweave/Makefile
@@ -1,4 +1,4 @@
-IMAGE_VERSION ?= 2.8.3-beta1
+IMAGE_VERSION ?= 2.8.3
 REGISTRY_USER ?= rajchaudhuri
 
 ALPINE_BASEIMAGE ?= alpine:3.19.1
diff --git a/reweave/scans/report.md b/reweave/scans/report.md
index 9f711e22..86f48ade 100644
--- a/reweave/scans/report.md
+++ b/reweave/scans/report.md
@@ -1,9 +1,9 @@
 # Vulnerability Report
 
 ```
-Report date: 2024-03-07
+Report date: 2024-03-08
 Unique vulnerability count: 14
-Images version: 2.8.3-beta1
+Images version: 2.8.3
 ```
 
 ## Scanner Details
diff --git a/weave b/weave
index 18f121f0..c81d02d9 100755
--- a/weave
+++ b/weave
@@ -3,6 +3,7 @@ set -e
 
 [ -n "$WEAVE_DEBUG" ] && set -x
 
+# Release Version
 SCRIPT_VERSION="unreleased"
 IMAGE_VERSION=latest
 [ "$SCRIPT_VERSION" = "unreleased" ] || IMAGE_VERSION=$SCRIPT_VERSION