Skip to content

Commit 230c428

Browse files
committed
Update watchdogs to include new header for internal retries
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent b8b4362 commit 230c428

File tree

4 files changed

+11
-21
lines changed

4 files changed

+11
-21
lines changed

template/golang-http/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.11 as watchdog
2-
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20-alpine as build
1+
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog
2+
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21-alpine as build
33

44
ARG TARGETPLATFORM
55
ARG BUILDPLATFORM
@@ -37,7 +37,7 @@ WORKDIR /go/src/handler
3737
RUN CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} GOFLAGS=${GOFLAGS} \
3838
go build --ldflags "-s -w" -o handler .
3939

40-
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.2 as ship
40+
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.4 as ship
4141
# Add non root user and certs
4242

4343
RUN apk --no-cache add ca-certificates \

template/golang-http/template.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
language: golang-http
22
fprocess: ./handler
33
welcome_message: |
4-
You have created a new function which uses Go 1.19 and Alpine
5-
Linux as its base image.
4+
This template is now deprecated, use the golang-middleware
5+
template instead.
66
7-
To disable the go module, for private vendor code, please use
8-
"--build-arg GO111MODULE=off" with faas-cli build or configure this
9-
via your stack.yml file.
10-
11-
See more: https://docs.openfaas.com/cli/templates/
12-
13-
For the template's repo and more examples:
14-
https://github.com/openfaas/golang-http-template
7+
https://docs.openfaas.com/languages/go/

template/golang-middleware/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.11 as watchdog
2-
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20-alpine as build
1+
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog
2+
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.21-alpine as build
33

44
ARG TARGETPLATFORM
55
ARG BUILDPLATFORM
@@ -34,7 +34,7 @@ WORKDIR /go/src/handler
3434
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} \
3535
go build --ldflags "-s -w" -o handler .
3636

37-
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.2 as ship
37+
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.4 as ship
3838

3939
# Add non root user and certs
4040
RUN apk --no-cache add ca-certificates \
Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
language: golang-middleware
22
fprocess: ./handler
33
welcome_message: |
4-
You have created a new function which uses Go 1.19 and Alpine
4+
You have created a new function which uses Go 1.21 and Alpine
55
Linux as its base image.
66
77
To disable the go module, for private vendor code, please use
88
"--build-arg GO111MODULE=off" with faas-cli build or configure this
99
via your stack.yml file.
1010
11-
See more: https://docs.openfaas.com/cli/templates/
12-
13-
For the template's repo and more examples:
14-
https://github.com/openfaas/golang-http-template
11+
Learn more: https://docs.openfaas.com/languages/go/

0 commit comments

Comments
 (0)