From 4fd2802d694c3bc198aaa50f0b38d0e16e293501 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Fri, 10 Nov 2023 11:32:56 +0000 Subject: [PATCH] Update watchdogs to include new header for internal retries Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- template/bun/Dockerfile | 2 +- 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/node14/Dockerfile | 2 +- template/node16/Dockerfile | 2 +- template/node17/Dockerfile | 2 +- template/node18/Dockerfile | 2 +- template/php7/Dockerfile | 2 +- template/php8/Dockerfile | 2 +- template/python/Dockerfile | 2 +- template/python3-debian/Dockerfile | 2 +- template/python3/Dockerfile | 2 +- template/ruby/Dockerfile | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/template/bun/Dockerfile b/template/bun/Dockerfile index 35e31bcc..9c722168 100644 --- a/template/bun/Dockerfile +++ b/template/bun/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.12 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} oven/bun:1.0-alpine as ship ARG TARGETPLATFORM diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile index 9fded116..2a020647 100644 --- a/template/csharp/Dockerfile +++ b/template/csharp/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM ghcr.io/openfaas/classic-watchdog:0.2.3 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 1d83167e..e16d6eae 100644 --- a/template/dockerfile/function/Dockerfile +++ b/template/dockerfile/function/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM ghcr.io/openfaas/classic-watchdog:0.2.3 as watchdog FROM alpine:3.18 diff --git a/template/go/Dockerfile b/template/go/Dockerfile index dc05f726..041232f7 100644 --- a/template/go/Dockerfile +++ b/template/go/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 as watchdog FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20-alpine3.18 as build ARG TARGETPLATFORM diff --git a/template/java11-vert-x/Dockerfile b/template/java11-vert-x/Dockerfile index f4b88850..db634029 100644 --- a/template/java11-vert-x/Dockerfile +++ b/template/java11-vert-x/Dockerfile @@ -27,7 +27,7 @@ COPY . /home/app/ RUN gradle build -FROM ghcr.io/openfaas/of-watchdog:0.9.10 as watchdog +FROM ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog FROM openjdk:11-jre-slim as ship COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog diff --git a/template/java11/Dockerfile b/template/java11/Dockerfile index 2863d3fe..f8b5bb49 100644 --- a/template/java11/Dockerfile +++ b/template/java11/Dockerfile @@ -28,7 +28,7 @@ COPY . /home/app/ RUN gradle build RUN find . -FROM ghcr.io/openfaas/of-watchdog:0.9.10 as watchdog +FROM ghcr.io/openfaas/of-watchdog:0.9.13 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 29cab781..83752c29 100644 --- a/template/node/Dockerfile +++ b/template/node/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 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 d036c7b7..2940fce4 100644 --- a/template/node14/Dockerfile +++ b/template/node14/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.10 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} node:14-alpine as ship ARG TARGETPLATFORM diff --git a/template/node16/Dockerfile b/template/node16/Dockerfile index c292102c..6a4701e0 100644 --- a/template/node16/Dockerfile +++ b/template/node16/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.10 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16-alpine as ship ARG TARGETPLATFORM diff --git a/template/node17/Dockerfile b/template/node17/Dockerfile index 3f37192c..510d841e 100644 --- a/template/node17/Dockerfile +++ b/template/node17/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.10 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} node:17-alpine as ship ARG TARGETPLATFORM diff --git a/template/node18/Dockerfile b/template/node18/Dockerfile index 4ab3c26b..ac6362d7 100644 --- a/template/node18/Dockerfile +++ b/template/node18/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.12 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.13 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} node:18-alpine as ship ARG TARGETPLATFORM diff --git a/template/php7/Dockerfile b/template/php7/Dockerfile index 937008ae..a6812c5f 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.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 as watchdog # start with the official Composer image and name it FROM --platform=${TARGETPLATFORM:-linux/amd64} composer:1 AS composer diff --git a/template/php8/Dockerfile b/template/php8/Dockerfile index f85a35de..62210025 100644 --- a/template/php8/Dockerfile +++ b/template/php8/Dockerfile @@ -1,7 +1,7 @@ ARG TARGETPLATFORM ARG BUILDPLATFORM -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 as watchdog # start with the official Composer image and name it FROM --platform=${TARGETPLATFORM:-linux/amd64} composer:latest AS composer diff --git a/template/python/Dockerfile b/template/python/Dockerfile index c17f17be..b265f643 100644 --- a/template/python/Dockerfile +++ b/template/python/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 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 f8df4356..2d70b0b8 100644 --- a/template/python3-debian/Dockerfile +++ b/template/python3-debian/Dockerfile @@ -1,5 +1,5 @@ ARG PYTHON_VERSION=3 -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} python:${PYTHON_VERSION} ARG TARGETPLATFORM diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile index 9ea015d3..7c771a06 100644 --- a/template/python3/Dockerfile +++ b/template/python3/Dockerfile @@ -1,5 +1,5 @@ ARG PYTHON_VERSION=3 -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} python:${PYTHON_VERSION}-alpine ARG TARGETPLATFORM diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile index eea237c8..2ab4d654 100644 --- a/template/ruby/Dockerfile +++ b/template/ruby/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.3 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} ruby:alpine ARG TARGETPLATFORM