Remove armhf templates and move to multi-arch / buildx

Migrate as per the python3 template in the classic Go templates, where a separate -armhf/-arm64 template is not required and TARGETPLATFORM is introduced for use with buildkit / buildx and faas-cli publish. Tested with an RPi with a 32-bit OS and with a 64-bit ARM OS (Ubuntu 20.04). Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
openfaas · Oct 3, 2022 · bf64898 · bf64898
1 parent e4f4f42
commit bf64898
Show file tree

Hide file tree

Showing 22 changed files with 14 additions and 379 deletions.
diff --git a/README.md b/README.md
@@ -5,17 +5,16 @@ The Python Flask templates that make use of the incubator project [of-watchdog](
 
 Templates available in this repository:
 
-- python27-flask
+- python3-http
+- python3-http-debian (ideal for compiled dependencies like numpy, pandas, pillow)
+
 - python3-flask
-- python3-flask-debian
-- python3-flask-armhf
+- python3-flask-debian (ideal for compiled dependencies like numpy, pandas, pillow)
 
-- python3-http
-- python3-http-debian
-- python3-http-armhf
+- python27-flask (Python 2.7 is deprecated)
 
 Notes:
-- To build and deploy a function for Raspberry Pi or ARMv7 in general, use the language templates ending in *-armhf*
+- To build and deploy a function for an ARM computer, you'll need to use `faas-cli publish --platforms`
 
 ## Picking your template
 

diff --git a/template/python3-flask-armhf/Dockerfile b/template/python3-flask-armhf/Dockerfile
diff --git a/template/python3-flask-armhf/function/__init__.py b/template/python3-flask-armhf/function/__init__.py
diff --git a/template/python3-flask-armhf/function/handler.py b/template/python3-flask-armhf/function/handler.py
diff --git a/template/python3-flask-armhf/function/handler_test.py b/template/python3-flask-armhf/function/handler_test.py
diff --git a/template/python3-flask-armhf/function/requirements.txt b/template/python3-flask-armhf/function/requirements.txt
diff --git a/template/python3-flask-armhf/function/tox.ini b/template/python3-flask-armhf/function/tox.ini
diff --git a/template/python3-flask-armhf/index.py b/template/python3-flask-armhf/index.py
diff --git a/template/python3-flask-armhf/requirements.txt b/template/python3-flask-armhf/requirements.txt
diff --git a/template/python3-flask-armhf/template.yml b/template/python3-flask-armhf/template.yml
diff --git a/template/python3-flask-debian/Dockerfile b/template/python3-flask-debian/Dockerfile
@@ -1,5 +1,5 @@
-FROM ghcr.io/openfaas/of-watchdog:0.9.6 as watchdog
-FROM python:3.7-slim-buster
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.6 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3.7-slim-buster
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

diff --git a/template/python3-flask/Dockerfile b/template/python3-flask/Dockerfile
@@ -1,5 +1,5 @@
-FROM ghcr.io/openfaas/of-watchdog:0.9.6 as watchdog
-FROM python:3.7-alpine
+FROM --platform=${TARGETPLATFORM:-linux/amd64} ghcr.io/openfaas/of-watchdog:0.9.6 as watchdog
+FROM --platform=${TARGETPLATFORM:-linux/amd64} python:3.7-alpine
 
 COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog
 RUN chmod +x /usr/bin/fwatchdog

diff --git a/template/python3-http-armhf/Dockerfile b/template/python3-http-armhf/Dockerfile
diff --git a/template/python3-http-armhf/function/handler.py b/template/python3-http-armhf/function/handler.py
diff --git a/template/python3-http-armhf/function/handler_test.py b/template/python3-http-armhf/function/handler_test.py
diff --git a/template/python3-http-armhf/function/requirements.txt b/template/python3-http-armhf/function/requirements.txt
diff --git a/template/python3-http-armhf/function/tox.ini b/template/python3-http-armhf/function/tox.ini
diff --git a/template/python3-http-armhf/index.py b/template/python3-http-armhf/index.py