Bump watchdogs for quick shutdowns

alexellis · alexellis · commit aee6813c573d · 2021-11-03T12:15:51.000Z
Fixes: #270 Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 
 FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder
 
diff --git a/template/dockerfile/function/Dockerfile b/template/dockerfile/function/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 
 FROM alpine:3.12
 
diff --git a/template/go/Dockerfile b/template/go/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.15-alpine3.13 as builder
 
 ARG TARGETPLATFORM
diff --git a/template/java11-vert-x/Dockerfile b/template/java11-vert-x/Dockerfile
@@ -28,7 +28,7 @@ COPY . /home/app/
 RUN gradle build
 RUN find . 
 
-FROM openfaas/of-watchdog:0.7.6 as watchdog
+FROM ghcr.io/openfaas/of-watchdog:0.9.0 as watchdog
 FROM openjdk:11-jre-slim as ship
 RUN apt-get update -qqy \
   && apt-get install -qqy \
diff --git a/template/java11/Dockerfile b/template/java11/Dockerfile
@@ -28,7 +28,7 @@ COPY . /home/app/
 RUN gradle build
 RUN find . 
 
-FROM openfaas/of-watchdog:0.7.6 as watchdog
+FROM ghcr.io/openfaas/of-watchdog:0.9.0 as watchdog
 
 FROM openjdk:11-jre-slim as ship
 RUN apt-get update -qqy \
diff --git a/template/node/Dockerfile b/template/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12-alpine as ship
 
 ARG TARGETPLATFORM
diff --git a/template/node12-debian/Dockerfile b/template/node12-debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} openfaas/of-watchdog:0.7.2 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12 as ship
 
 ARG TARGETPLATFORM
diff --git a/template/node12/Dockerfile b/template/node12/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.8.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12-alpine as ship
 
 ARG TARGETPLATFORM
diff --git a/template/node14/Dockerfile b/template/node14/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.8.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:14-alpine as ship
 
 ARG TARGETPLATFORM
diff --git a/template/php7/Dockerfile b/template/php7/Dockerfile
@@ -1,7 +1,7 @@
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 
 # start with the official Composer image and name it
 FROM --platform=${TARGETPLATFORM:-linux/amd64} composer:1 AS composer
diff --git a/template/python/Dockerfile b/template/python/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:2.7-alpine
 
 ARG TARGETPLATFORM
diff --git a/template/python3-debian/Dockerfile b/template/python3-debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3
 
 ARG TARGETPLATFORM
diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3-alpine
 
 ARG TARGETPLATFORM
diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ruby:alpine
 
 ARG TARGETPLATFORM

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog`
	`1`	`+FROM ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog`
`2`	`2`
`3`	`3`	`FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog`
	`1`	`+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog`
`2`	`2`	`FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.15-alpine3.13 as builder`
`3`	`3`
`4`	`4`	`ARG TARGETPLATFORM`