Update watchdog versions and move Go to 1.15

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
openfaas · Feb 21, 2021 · b48afeb · b48afeb
1 parent 2501999
commit b48afeb
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -13,9 +13,10 @@ This repository contains the Classic OpenFaaS templates, but many more are avail
 | Name | Language | Version | Linux base | Watchdog | Link
 |:-----|:---------|:--------|:-----------|:---------|:----
 | dockerfile | Dockerfile | N/A | Alpine Linux | classic | [Dockerfile template](https://github.com/openfaas/templates/tree/master/template/dockerfile)
-| go | Go | 1.13 | Alpine Linux | classic | [Go template](https://github.com/openfaas/templates/tree/master/template/go)
-| node12 | NodeJS | 12.13.0 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node12)
-| node | NodeJS | 12.13.0 | Alpine Linux | classic | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node)
+| go | Go | 1.15 | Alpine Linux | classic | [Go template](https://github.com/openfaas/templates/tree/master/template/go)
+| node12 | NodeJS | 12 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node14)
+| node14 | NodeJS | 14 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node12)
+| 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)
 | python | Python | 2.7 | Alpine Linux | classic | [Python 2.7 template](https://github.com/openfaas/templates/tree/master/template/python)

diff --git a/template/csharp/Dockerfile b/template/csharp/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
+FROM ghcr.io/openfaas/classic-watchdog:0.1.5 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.4 as watchdog
+FROM ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
 
 FROM alpine:3.12
 

diff --git a/template/go/Dockerfile b/template/go/Dockerfile
@@ -1,5 +1,5 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.4 as watchdog
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.13-alpine3.12 as builder
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.15-alpine3.13 as builder
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM

diff --git a/template/go/go.mod b/template/go/go.mod
@@ -1,5 +1,5 @@
 module handler
 
-go 1.13
+go 1.15
 
 replace handler/function => ./function
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.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:12-alpine 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.3 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.8.4 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.3 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.8.4 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.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
 
 # start with the official Composer image and name it
 FROM --platform=${TARGETPLATFORM:-linux/amd64} composer:1.7 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.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 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.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 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.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 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.4 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.1.5 as watchdog
 FROM --platform=${TARGETPLATFORM:-linux/amd64} ruby:alpine
 
 ARG TARGETPLATFORM