Merge branch 'main' into support-tag-prefixes

giantswarm · Jul 26, 2024 · abceca4 · abceca4
2 parents 5ab1b2f + 54a02dc
commit abceca4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [6.15.1] - 2024-07-26
+
+### Changed
+
+- Bump base image to `golang:1.21.12-alpine3.19` to fix reported CVEs.
+
 ## [6.15.0] - 2024-07-18
 
 ### Changed
@@ -485,7 +491,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add changelog.
 - Add SemVer versioning.
 
-[Unreleased]: https://github.com/giantswarm/architect/compare/v6.15.0...HEAD
+[Unreleased]: https://github.com/giantswarm/architect/compare/v6.15.1...HEAD
+[6.15.1]: https://github.com/giantswarm/architect/compare/v6.15.0...v6.15.1
 [6.15.0]: https://github.com/giantswarm/architect/compare/v6.14.1...v6.15.0
 [6.14.1]: https://github.com/giantswarm/architect/compare/v6.14.0...v6.14.1
 [6.14.0]: https://github.com/giantswarm/architect/compare/v6.13.0...v6.14.0

diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM gsoci.azurecr.io/giantswarm/helm-chart-testing:v3.11.0 AS ct
 
 FROM gsoci.azurecr.io/giantswarm/app-build-suite:1.2.2 AS abs
 
-FROM gsoci.azurecr.io/giantswarm/golang:1.21.6-alpine3.18 AS golang
+FROM gsoci.azurecr.io/giantswarm/golang:1.21.12-alpine3.19 AS golang
 
 FROM gsoci.azurecr.io/giantswarm/conftest:v0.54.0 AS conftest
 

diff --git a/pkg/project/project.go b/pkg/project/project.go
@@ -3,7 +3,7 @@ package project
 var (
 	buildTimestamp string
 	gitSHA         string
-	version        = "6.15.0"
+	version        = "6.15.1"
 )
 
 func BuildTimestamp() string {