Add Flask image

.github/workflows/branch-cleanup.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image-name: [tna-python, tna-python-django]
+        image-name: [tna-python, tna-python-flask, tna-python-django]
     steps:
       - name: Prepare image tag
         run: |

.github/workflows/publish.yml

@@ -34,6 +34,16 @@ jobs:
       publish: true
       ignore-linting-rules: DL3002
 
+  python-flask:
+    name: Python Flask
+    needs: python
+    uses: ./.github/workflows/_docker-build-deploy.yml
+    with:
+      image-name: tna-python-flask
+      docker-context: docker/tna-python-flask
+      dockerfile: Dockerfile
+      publish: true
+
   python-django:
     name: Python Django
     needs: python

.github/workflows/remove-untagged.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image-name: [tna-python, tna-python-root, tna-python-django, tna-python-django-root]
+        image-name: [tna-python, tna-python-root, tna-python-flask, tna-python-django, tna-python-django-root]
     env:
       PER_PAGE: 100
     steps:

.github/workflows/test.yml

@@ -31,6 +31,16 @@ jobs:
       publish: false
       ignore-linting-rules: DL3002
 
+  python-flask:
+    name: Python Flask
+    needs: python
+    uses: ./.github/workflows/_docker-build-deploy.yml
+    with:
+      image-name: tna-python-flask
+      docker-context: docker/tna-python-flask
+      dockerfile: Dockerfile
+      publish: false
+
   python-django:
     name: Python Django
     needs: python

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased](https://github.com/nationalarchives/docker/compare/v0.1.11...HEAD)
 
 ### Added
+
+- Initial release of `tna-python-flask` Docker image
+
 ### Changed
 ### Deprecated
 ### Removed

docker/tna-python-flask/Dockerfile

@@ -0,0 +1,24 @@
+ARG BASE_IMAGE_TAG=latest
+FROM ghcr.io/nationalarchives/tna-python:"$BASE_IMAGE_TAG"
+
+# ==========================================
+# Move the existing build and run scripts to
+# a -common suffix so that we can keep using
+# the base tna-build and tna-run commands
+# ==========================================
+RUN set -eux; \
+    \
+    mv /home/app/.local/bin/tna-run /home/app/.local/bin/tna-run-common
+
+# ==========================================
+# These new commands are just proxies to the
+# renamed tna-build/tna-run scripts included
+# in the parent Docker image, but with extra
+# Django-specific commands
+# ==========================================
+COPY --chown=app bin/tna-run /home/app/.local/bin/
+
+# ==========================================
+# Allow all our scripts to be executable
+# ==========================================
+RUN chmod +x /home/app/.local/bin/tna-run

docker/tna-python-flask/README.md

@@ -0,0 +1,23 @@
+# tna-python-flask
+
+This image extends `tna-python` but adds checks for environment variables specific to Flask.
+
+This image assumes you have a version of Flask added to you project's `pyproject.toml` file.
+
+## Environment variables
+
+All environment variables defined in [tna-python](../tna-python/README.md) as well as:
+
+| Variable     | Description                                     | Default |
+| ------------ | ----------------------------------------------- | ------- |
+| `SECRET_KEY` | A random key used to secure client session data | [None]  |
+
+A secret key can be generated using:
+
+```sh
+python -c 'import secrets; print(secrets.token_hex())'
+```
+
+## Commands for the Dockerfile
+
+The command `tna-run` is moved to `tna-run-common` and a new and `tna-run` command is added.

docker/tna-python-flask/bin/tna-run

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [[ -z $SECRET_KEY ]]
+then
+  echo -e "Error: Environment variable SECRET_KEY not set";
+  exit 1
+fi
+
+tna-run-common "$1"