From f8c3e0f878eec5c5bcfff315b7cc1f27d56344cc Mon Sep 17 00:00:00 2001
From: "Alex Ellis (OpenFaaS Ltd)" <alexellis2@gmail.com>
Date: Sat, 8 Jun 2024 21:05:48 +0100
Subject: [PATCH] Update to Go 1.22 and Alpine 3.20.0

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
---
 Dockerfile        | 6 +++---
 Dockerfile.redist | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f780cc1c..fc2db074 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM ghcr.io/openfaas/license-check:0.4.1 as license-check
 
 # Build stage
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22 as builder
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -40,7 +40,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=0 \
    -o faas-cli
 
 # CICD stage
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18 as root
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20.0 as root
 
 ARG REPO_URL
 
@@ -57,7 +57,7 @@ ENV PATH=$PATH:/usr/bin/
 ENTRYPOINT [ "faas-cli" ]
 
 # Release stage
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.16.2 as release
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20.0 as release
 
 ARG REPO_URL
 
diff --git a/Dockerfile.redist b/Dockerfile.redist
index 610a5f2a..7600e115 100644
--- a/Dockerfile.redist
+++ b/Dockerfile.redist
@@ -1,7 +1,7 @@
 FROM ghcr.io/openfaas/license-check:0.4.1 as license-check
 
 # Build stage
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20 as builder
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22 as builder
 
 ARG GIT_COMMIT
 ARG VERSION
@@ -70,7 +70,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build --ldflags "-s -w \
        -o faas-cli-arm64
 
 # Release stage
-FROM alpine:3.18 as release
+FROM alpine:3.20.0 as release
 
 RUN apk --no-cache add ca-certificates git