Merge branch 'main' into main#release#v6.11.1

ljakimczuk · web-flow · commit 165947b74670 · 2024-10-08T12:32:35.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  architect: giantswarm/architect@5.2.1
+  architect: giantswarm/architect@5.9.0
 
 workflows:
   build:
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM gsoci.azurecr.io/giantswarm/alpine:3.20.0
+FROM gsoci.azurecr.io/giantswarm/alpine:3.20.3
 
 RUN apk add --no-cache ca-certificates
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM gsoci.azurecr.io/giantswarm/alpine:3.20.0`
	`1`	`+FROM gsoci.azurecr.io/giantswarm/alpine:3.20.3`
`2`	`2`
`3`	`3`	`RUN apk add --no-cache ca-certificates`
`4`	`4`