From 0b43c7072bd728bb231b5289bacd096398f493dc Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Wed, 4 Oct 2023 11:20:36 +0100 Subject: [PATCH] Update watchdog and Alpine Linux versions Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- README.md | 2 +- template/bun/Dockerfile | 4 ++-- template/csharp/Dockerfile | 2 +- template/dockerfile/function/Dockerfile | 4 ++-- template/node/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 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 6b89e559..1b1e02b1 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ This repository contains the Classic OpenFaaS templates, but many more are avail | node16 | NodeJS | 16 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node16) | node17 | NodeJS | 17 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node17) | node18 | NodeJS | 18 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node18) -| bun-express | Bun | Latest | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/bun-express) +| bun-express | Bun | 1.0 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/bun-express) | node | NodeJS | 12 | Alpine Linux | classic | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node) | python3 | Python | 3 | Alpine Linux | classic | [Python 3 template](https://github.com/openfaas/templates/tree/master/template/python3) | python3-debian | Python | 3 | Debian Linux | classic | [Python 3 Debian template](https://github.com/openfaas/templates/tree/master/template/python3-debian) diff --git a/template/bun/Dockerfile b/template/bun/Dockerfile index 68fee35d..35e31bcc 100644 --- a/template/bun/Dockerfile +++ b/template/bun/Dockerfile @@ -1,5 +1,5 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.11 as watchdog -FROM --platform=${TARGETPLATFORM:-linux/amd64} oven/bun:alpine as ship +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.12 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} oven/bun:1.0-alpine as ship ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile index 1efd5bb3..9fded116 100644 --- a/template/csharp/Dockerfile +++ b/template/csharp/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/openfaas/classic-watchdog:0.2.1 as watchdog +FROM ghcr.io/openfaas/classic-watchdog:0.2.2 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 0314b162..1d83167e 100644 --- a/template/dockerfile/function/Dockerfile +++ b/template/dockerfile/function/Dockerfile @@ -1,6 +1,6 @@ -FROM ghcr.io/openfaas/classic-watchdog:0.2.1 as watchdog +FROM ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog -FROM alpine:3.12 +FROM alpine:3.18 RUN mkdir -p /home/app diff --git a/template/node/Dockerfile b/template/node/Dockerfile index 9d2b3635..29cab781 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.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12-alpine as ship ARG TARGETPLATFORM diff --git a/template/node18/Dockerfile b/template/node18/Dockerfile index 0ce47df9..4ab3c26b 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.11 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.12 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 68f97d7b..937008ae 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.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 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 c5019097..f85a35de 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.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 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 98c62175..c17f17be 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.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 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 28f7fdc0..f8df4356 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.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} python:${PYTHON_VERSION} ARG TARGETPLATFORM diff --git a/template/python3/Dockerfile b/template/python3/Dockerfile index a399cb14..9ea015d3 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.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} python:${PYTHON_VERSION}-alpine ARG TARGETPLATFORM diff --git a/template/ruby/Dockerfile b/template/ruby/Dockerfile index b12cd2a4..eea237c8 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.1 as watchdog +FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.2.2 as watchdog FROM --platform=${TARGETPLATFORM:-linux/amd64} ruby:alpine ARG TARGETPLATFORM