Migrate to Go 1.20 for both templates

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
openfaas · Jun 27, 2023 · b8b4362 · b8b4362
1 parent e3d205e
commit b8b4362
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/template/golang-http/Dockerfile b/template/golang-http/Dockerfile
@@ -1,5 +1,5 @@
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.11 as watchdog
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as build
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20-alpine as build
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -37,7 +37,7 @@ WORKDIR /go/src/handler
 RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOFLAGS=${GOFLAGS} \
  go build --ldflags "-s -w" -o handler .
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.17.2 as ship
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.2 as ship
 # Add non root user and certs
 
 RUN apk --no-cache add ca-certificates \

diff --git a/template/golang-http/go.mod b/template/golang-http/go.mod
@@ -1,5 +1,5 @@
 module handler
 
-go 1.18
+go 1.19
 
 require github.com/openfaas/templates-sdk/go-http v0.0.0-20220408082716-5981c545cb03
diff --git a/template/golang-middleware/Dockerfile b/template/golang-middleware/Dockerfile
@@ -1,5 +1,5 @@
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.11 as watchdog
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.19-alpine as build
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20-alpine as build
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -34,7 +34,7 @@ WORKDIR /go/src/handler
 RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
  go build --ldflags "-s -w" -o handler .
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.17.2 as ship
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.2 as ship
 
 # Add non root user and certs
 RUN apk --no-cache add ca-certificates \

diff --git a/template/golang-middleware/go.mod b/template/golang-middleware/go.mod
@@ -1,3 +1,3 @@
 module handler
 
-go 1.18
+go 1.19