Skip to content

Commit

Permalink
Remove node14 template and update watchdogs
Browse files Browse the repository at this point in the history
The newer of-watchdog will stop the "JWT Auth: false" message
from appearing when functions start up.

The node14 template is available in older commits if you need
it for some reason.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
  • Loading branch information
alexellis committed Sep 3, 2024
1 parent 3c79e32 commit 220bdfb
Show file tree
Hide file tree
Showing 16 changed files with 8 additions and 268 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ See: `faas-cli template store list` to see which templates are both: recommended
|:-----|:---------|:--------|:-----------|:---------|:----
| dockerfile | Dockerfile | N/A | Alpine Linux | classic | [Dockerfile template](https://github.com/openfaas/templates/tree/master/template/dockerfile)
| go | Go | 1.22 | Alpine Linux | classic | [Legacy Go template (deprecated)](https://github.com/openfaas/templates/tree/master/template/go)
| node14 | NodeJS | 14 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node14)
| node16 | NodeJS | 16 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node16)
| node17 | NodeJS | 17 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node17)
| node18 | NodeJS | 18 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node18)
Expand Down
2 changes: 1 addition & 1 deletion template/bun/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.5 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.6 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} oven/bun:1.0-alpine AS ship

ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion template/dockerfile/function/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog

FROM alpine:3.18
FROM alpine:3.20.2

RUN mkdir -p /home/app

Expand Down
2 changes: 1 addition & 1 deletion template/java11-vert-x/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ COPY . /home/app/

RUN gradle build

FROM ghcr.io/openfaas/of-watchdog:0.10.5 AS watchdog
FROM ghcr.io/openfaas/of-watchdog:0.10.6 AS watchdog
FROM openjdk:11-jre-slim AS ship

COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
Expand Down
2 changes: 1 addition & 1 deletion template/java11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY . /home/app/
RUN gradle build
RUN find .

FROM ghcr.io/openfaas/of-watchdog:0.10.5 AS watchdog
FROM ghcr.io/openfaas/of-watchdog:0.10.6 AS watchdog

FROM openjdk:11-jre-slim AS ship
RUN apt-get update -qqy \
Expand Down
1 change: 0 additions & 1 deletion template/node14/.dockerignore

This file was deleted.

62 changes: 0 additions & 62 deletions template/node14/Dockerfile

This file was deleted.

12 changes: 0 additions & 12 deletions template/node14/function/handler.js

This file was deleted.

12 changes: 0 additions & 12 deletions template/node14/function/package.json

This file was deleted.

144 changes: 0 additions & 144 deletions template/node14/index.js

This file was deleted.

16 changes: 0 additions & 16 deletions template/node14/package.json

This file was deleted.

12 changes: 0 additions & 12 deletions template/node14/template.yml

This file was deleted.

2 changes: 1 addition & 1 deletion template/node16/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.5 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.6 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16-alpine AS ship

ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion template/node17/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.5 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.6 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} node:17-alpine AS ship

ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion template/node18/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.5 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.6 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} node:18-alpine AS ship

ARG TARGETPLATFORM
Expand Down
2 changes: 1 addition & 1 deletion template/node20/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.5 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.10.6 AS watchdog
FROM --platform=${TARGETPLATFORM:-linux/amd64} node:20-alpine AS ship

ARG TARGETPLATFORM
Expand Down

0 comments on commit 220bdfb

Please sign in to comment.