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) <alexellis2@gmail.com>
openfaas · Jul 16, 2024 · 1613af2 · 1613af2
1 parent 3ea35c2
commit 1613af2
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -13,23 +13,23 @@ 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.20 | Alpine Linux | classic | [Go template](https://github.com/openfaas/templates/tree/master/template/go)
-| node14 | NodeJS | 14 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node14)
-| 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)
+| 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)
 | node20 | NodeJS | 20 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/node20)
 | bun-express | Bun | 1.0 | Alpine Linux | of-watchdog | [NodeJS template](https://github.com/openfaas/templates/tree/master/template/bun-express)
 | node | NodeJS | 20 | 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)
+| python3 | Python | 3 | Alpine Linux | classic | [Legacy Python 3 template](https://github.com/openfaas/templates/tree/master/template/python3)
+| python3-debian | Python | 3 | Debian Linux | classic | [Legacy Python 3 Debian template](https://github.com/openfaas/templates/tree/master/template/python3-debian)
+| python2.7 | Python | 2.7.18 | Alpine Linux | classic | [Python 2.7 template (deprecated)](https://github.com/openfaas/templates/tree/master/template/python2.7)
 | 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)
 | java11 | Java | 11 | Debian GNU/Linux | of-watchdog | [Java LTS template](https://github.com/openfaas/templates/tree/master/template/java11)
-| ruby | Ruby | 2.7 | Alpine Linux 3.11 | classic| [Ruby template](https://github.com/openfaas/templates/tree/master/template/ruby)
+| ruby | Ruby | 2.7 | Alpine Linux | classic| [Ruby template](https://github.com/openfaas/templates/tree/master/template/ruby)
 | php7 | PHP | 7.4 | Alpine Linux | classic | [PHP 7 template](https://github.com/openfaas/templates/tree/master/template/php7)
 | php8 | PHP | 8.2 | Alpine Linux | classic | [PHP 8 template](https://github.com/openfaas/templates/tree/master/template/php8)
-| csharp | C# | N/A | Debian GNU/Linux 9 | classic | [C# template](https://github.com/openfaas/templates/tree/master/template/csharp)
+| csharp | C# | N/A | Debian GNU/Linux 9 | classic | [Legacy C# template (deprecated)](https://github.com/openfaas/templates/tree/master/template/csharp)
 
 For more information on the templates check out the [docs](https://docs.openfaas.com/cli/templates/).
 

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.3.1 as watchdog
-FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.20-alpine3.18 as build
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog
+FROM --platform=${BUILDPLATFORM:-linux/amd64} golang:1.22-alpine3.20 AS build
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
@@ -37,7 +37,7 @@ WORKDIR /go/src/handler
 RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} CGO_ENABLED=${CGO_ENABLED} \
     go build --ldflags "-s -w" -o handler .
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.18.2 as ship
+FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.20.1 AS ship
 
 RUN apk --no-cache add ca-certificates \
     && addgroup -S app && adduser -S -g app app

diff --git a/template/java11-vert-x/Dockerfile b/template/java11-vert-x/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:11-jdk-slim as builder
+FROM openjdk:11-jdk-slim AS builder
 
 RUN apt-get update -qqy \
   && apt-get install -qqy \
@@ -27,8 +27,8 @@ COPY . /home/app/
 
 RUN gradle build
 
-FROM ghcr.io/openfaas/of-watchdog:0.10.4 as watchdog
-FROM openjdk:11-jre-slim as ship
+FROM ghcr.io/openfaas/of-watchdog:0.10.4 AS watchdog
+FROM openjdk:11-jre-slim AS ship
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

diff --git a/template/python/Dockerfile → template/python2.7/Dockerfile b/template/python/Dockerfile → template/python2.7/Dockerfile
@@ -1,5 +1,5 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 as watchdog
-FROM --platform=${TARGETPLATFORM:-linux/amd64} python:2.7-alpine
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/classic-watchdog:0.3.1 AS watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} python:2.7.18-alpine
 
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM

diff --git a/template/python/function/handler.py → template/python2.7/function/handler.py b/template/python/function/handler.py → template/python2.7/function/handler.py
diff --git a/template/python/function/requirements.txt → template/python2.7/function/requirements.txt b/template/python/function/requirements.txt → template/python2.7/function/requirements.txt
diff --git a/template/python/index.py → template/python2.7/index.py b/template/python/index.py → template/python2.7/index.py
diff --git a/template/python/requirements.txt → template/python2.7/requirements.txt b/template/python/requirements.txt → template/python2.7/requirements.txt
diff --git a/template/python/template.yml → template/python2.7/template.yml b/template/python/template.yml → template/python2.7/template.yml