From 212c000e21e0b43867365b139fa89e3f52b4522c Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Wed, 3 Nov 2021 11:10:50 +0000 Subject: [PATCH] Bump watchdogs for quick shutdowns Fixes: #270 Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- template/csharp/Dockerfile | 2 +- template/dockerfile/function/Dockerfile | 2 +- template/go/Dockerfile | 2 +- template/java11-vert-x/Dockerfile | 2 +- template/java11/Dockerfile | 2 +- template/node/Dockerfile | 2 +- template/node12-debian/Dockerfile | 2 +- template/node12/Dockerfile | 2 +- template/node14/Dockerfile | 2 +- template/php7/Dockerfile | 2 +- template/python/Dockerfile | 2 +- template/python3-debian/Dockerfile | 2 +- template/python3/Dockerfile | 2 +- template/ruby/Dockerfile | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile index fdf9e3cc..29db2059 100644 --- 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 index c37a590f..57cab28e 100644 --- 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 index 3510304c..fe69c770 100644 --- 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 index 5bc99f56..8931139c 100644 --- 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 index fd8d9f34..33d4fa05 100644 --- 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 index c3f32dc0..617f63b7 100644 --- 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 index 66a55fa4..67b9395c 100644 --- 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 index f20b32bb..4807a725 100644 --- 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 index b9a4d6ab..dd96e276 100644 --- 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 index c1ebd47e..daabc1a3 100644 --- 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 index c35db1fa..fe7f802e 100644 --- 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 index b90e6a30..d3942f31 100644 --- 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 index a243d0fd..b6c9272a 100644 --- 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 index 8b216aa9..06f9f241 100644 --- 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