Skip to content

Commit 1613af2

Browse files
alexellisalexellis
committed
Rename legacy python template to python2.7
Python 2.7 is long deprecated, however the template remains available for those who need it. Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>
1 parent 3ea35c2 commit 1613af2

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

‎README.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ This repository contains the Classic OpenFaaS templates, but many more are avail
1313
| Name | Language | Version | Linux base | Watchdog | Link
1414
|:-----|:---------|:--------|:-----------|:---------|:----
1515
| dockerfile | Dockerfile | N/A | Alpine Linux | classic | [Dockerfile template](https://github.com/openfaas/templates/tree/master/template/dockerfile)
16-
| go | Go | 1.20 | Alpine Linux | classic | [Go template](https://github.com/openfaas/templates/tree/master/template/go)
17-
| node14 | NodeJS | 14 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node14)
18-
| node16 | NodeJS | 16 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node16)
19-
| node17 | NodeJS | 17 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node17)
20-
| node18 | NodeJS | 18 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node18)
16+
| go | Go | 1.22 | Alpine Linux | classic | [Legacy Go template (deprecated)](https://github.com/openfaas/templates/tree/master/template/go)
17+
| node14 | NodeJS | 14 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node14)
18+
| node16 | NodeJS | 16 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node16)
19+
| node17 | NodeJS | 17 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node17)
20+
| node18 | NodeJS | 18 | Alpine Linux | of-watchdog | [NodeJS template (deprecated)](https://github.com/openfaas/templates/tree/master/template/node18)
2121
| node20 | NodeJS | 20 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node20)
2222
| bun-express | Bun | 1.0 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/bun-express)
2323
| node | NodeJS | 20 | Alpine Linux | classic | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node)
24-
| python3 | Python | 3 | Alpine Linux | classic | [Python 3 template](https://github.com/openfaas/templates/tree/master/template/python3)
25-
| python3-debian | Python | 3 | Debian Linux | classic | [Python 3 Debian template](https://github.com/openfaas/templates/tree/master/template/python3-debian)
26-
| python | Python | 2.7 | Alpine Linux | classic | [Python 2.7 template](https://github.com/openfaas/templates/tree/master/template/python)
24+
| python3 | Python | 3 | Alpine Linux | classic | [Legacy Python 3 template](https://github.com/openfaas/templates/tree/master/template/python3)
25+
| python3-debian | Python | 3 | Debian Linux | classic | [Legacy Python 3 Debian template](https://github.com/openfaas/templates/tree/master/template/python3-debian)
26+
| python2.7 | Python | 2.7.18 | Alpine Linux | classic | [Python 2.7 template (deprecated)](https://github.com/openfaas/templates/tree/master/template/python2.7)
2727
| java11-vert-x | Java and [Vert.x](https://vertx.io/) | 11 | Debian GNU/Linux | of-watchdog | [Java LTS template](https://github.com/openfaas/templates/tree/master/template/java11-vert-x)
2828
| java11 | Java | 11 | Debian GNU/Linux | of-watchdog | [Java LTS template](https://github.com/openfaas/templates/tree/master/template/java11)
29-
| ruby | Ruby | 2.7 | Alpine Linux 3.11 | classic| [Ruby template](https://github.com/openfaas/templates/tree/master/template/ruby)
29+
| ruby | Ruby | 2.7 | Alpine Linux | classic| [Ruby template](https://github.com/openfaas/templates/tree/master/template/ruby)
3030
| php7 | PHP | 7.4 | Alpine Linux | classic | [PHP 7 template](https://github.com/openfaas/templates/tree/master/template/php7)
3131
| php8 | PHP | 8.2 | Alpine Linux | classic | [PHP 8 template](https://github.com/openfaas/templates/tree/master/template/php8)
32-
| csharp | C# | N/A | Debian GNU/Linux 9 | classic | [C# template](https://github.com/openfaas/templates/tree/master/template/csharp)
32+
| csharp | C# | N/A | Debian GNU/Linux 9 | classic | [Legacy C# template (deprecated)](https://github.com/openfaas/templates/tree/master/template/csharp)
3333

3434
For more information on the templates check out the [docs](https://docs.openfaas.com/cli/templates/).
3535

‎template/go/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog
2-
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20-alpine3.18 as build
1+
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog
2+
FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22-alpine3.20 AS build
33

44
ARG TARGETPLATFORM
55
ARG BUILDPLATFORM
@@ -37,7 +37,7 @@ WORKDIR /go/src/handler
3737
RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=${CGO_ENABLED} \
3838
go build --ldflags "-s -w" -o handler .
3939

40-
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.2 as ship
40+
FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20.1 AS ship
4141

4242
RUN apk --no-cache add ca-certificates \
4343
&& addgroup -S app && adduser -S -g app app

‎template/java11-vert-x/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openjdk:11-jdk-slim as builder
1+
FROM openjdk:11-jdk-slim AS builder
22

33
RUN apt-get update -qqy \
44
&& apt-get install -qqy \
@@ -27,8 +27,8 @@ COPY . /home/app/
2727

2828
RUN gradle build
2929

30-
FROM ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog
31-
FROM openjdk:11-jre-slim as ship
30+
FROM ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog
31+
FROM openjdk:11-jre-slim AS ship
3232

3333
COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
3434
RUN chmod +x /usr/bin/fwatchdog

‎template/python/Dockerfile ‎template/python2.7/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog
2-
FROM --platform=${TARGETPLATFORM:-linux/amd64} python:2.7-alpine
1+
FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog
2+
FROM --platform=${TARGETPLATFORM:-linux/amd64} python:2.7.18-alpine
33

44
ARG TARGETPLATFORM
55
ARG BUILDPLATFORM

‎template/python/function/handler.py ‎template/python2.7/function/handler.py

File renamed without changes.

‎template/python/function/requirements.txt ‎template/python2.7/function/requirements.txt

File renamed without changes.

‎template/python/index.py ‎template/python2.7/index.py

File renamed without changes.

‎template/python/requirements.txt ‎template/python2.7/requirements.txt

File renamed without changes.

‎template/python/template.yml ‎template/python2.7/template.yml

File renamed without changes.

0 commit comments

Comments
 (0)