From c3cc2107c6e7a19abcbb33c2d1dc5c97cb4f9465 Mon Sep 17 00:00:00 2001
From: Raj Chaudhuri <rajch@hotmail.com>
Date: Sat, 6 Apr 2024 09:05:57 +0530
Subject: [PATCH] Add release 2.8.5

---
 CHANGELOG.md             | 7 +++++++
 reweave/CHANGELOG.md     | 7 ++++++-
 reweave/Makefile         | 2 +-
 reweave/build/Dockerfile | 3 +--
 reweave/scans/report.md  | 4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f30555fc..03b00db0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Release 2.8.5
+
+This release has upgraded dependencies based on CVE recommendations.
+
+* Build with Go version 1.21.9
+* A dependency has been updated
+
 ## Release 2.8.4
 
 The alpine base image used by `weave-kube` and `weave-npc` was upgraded to version 3.19.1 in the previous release. In this version, the default iptables backend is nftables, and the legacy backend is not included. Our scripts and programs assume legacy as the default backend, and change to nft if autodetected, or if we ask for it. So, the build Dockerfile (reweave/build/Dockerfile) was changed to also install the Alpine `iptables-legacy` package , and change the `iptables-{save,restore}` symbolic links to point to the legacy backend by default.
diff --git a/reweave/CHANGELOG.md b/reweave/CHANGELOG.md
index 14b8e670..bf86336e 100644
--- a/reweave/CHANGELOG.md
+++ b/reweave/CHANGELOG.md
@@ -2,7 +2,12 @@
 
 All changes made to the weave net codebase during the reweave effort will be documented in this file.
 
-## 2.8.5-beta1
+## 2.8.5
+
+* Changed version in `reweave/Makefile` to 2.8.5
+* Modified reweave and main CHANGELOG.md
+
+## 2.8.5-beta1 (ac180cfc)
 
 ### Changed
 
diff --git a/reweave/Makefile b/reweave/Makefile
index 989fba57..b29ce866 100644
--- a/reweave/Makefile
+++ b/reweave/Makefile
@@ -1,4 +1,4 @@
-IMAGE_VERSION ?= 2.8.5-beta1
+IMAGE_VERSION ?= 2.8.5
 REGISTRY_USER ?= rajchaudhuri
 
 ALPINE_BASEIMAGE ?= alpine:3.19.1
diff --git a/reweave/build/Dockerfile b/reweave/build/Dockerfile
index f6a9ac7d..945969e6 100644
--- a/reweave/build/Dockerfile
+++ b/reweave/build/Dockerfile
@@ -26,8 +26,7 @@ RUN <<EOCROSSCOMPILERS
 set -e
 echo 'Acquire::Retries "6";' > /etc/apt/apt.conf.d/80-retries
 for platform in ${DEB_CROSSPLATFORMS}; do dpkg --add-architecture $platform; done 
-apt-get update --error-on=any
-apt-get upgrade -y
+apt-get update
 apt-get install -y build-essential
 for platform in ${DEB_CROSSPLATFORMS}; do apt-get install -y crossbuild-essential-${platform}; done 
 apt-get clean
diff --git a/reweave/scans/report.md b/reweave/scans/report.md
index 0c249a7c..6fe55307 100644
--- a/reweave/scans/report.md
+++ b/reweave/scans/report.md
@@ -1,9 +1,9 @@
 # Vulnerability Report
 
 ```
-Report date: 2024-04-04
+Report date: 2024-04-06
 Unique vulnerability count: 17
-Images version: 2.8.5-beta1
+Images version: 2.8.5
 ```
 
 ## Scanner Details