From 0fcbee0cc870ec8fe26d84cbd7001e4fe1ff2207 Mon Sep 17 00:00:00 2001 From: Sarah Sloan Date: Fri, 12 Jul 2024 14:18:24 +0100 Subject: [PATCH] add db tag --- .github/workflows/publish.yml | 1 + README.md | 4 ++-- python-flask/tags | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1ad1046..c62b30e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -26,6 +26,7 @@ jobs: echo "PYTHON_FLASK_DEV_PYTHON=$PYTHON_FLASK_DEV_PY" >> $GITHUB_ENV echo "PYTHON_FLASK_DEV_FLASK=$PYTHON_FLASK_DEV_FLASK" >> $GITHUB_ENV echo "PYTHON_FLASK_DEV_FRONTEND=$PYTHON_FLASK_DEV_JINJA" >> $GITHUB_ENV + echo "PYTHON_FLASK_DEV_DB=$PYTHON_FLASK_DEV_SQL_ALCHEMY" >> $GITHUB_ENV - name: Docker metadata id: metadata diff --git a/README.md b/README.md index ba95bb6..28da2de 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Base images and requirements definitions for development of funding service desi ## Python Flask Dev Contains requirements files for different versions of a python flask app. The [Dockerfile](./python-flask-dev/Dockerfile) contains the following build targets: -- `flask`: Developer image based on python 3.10 bullseye, with Flask 3.0.3 installed on top, plus everything in [requirements-dev.txt](./python-flask-dev/requirements-dev.txt) +- `flask`: Developer image based on python 3.10 bullseye, with Flask 3.0.3 installed on top, plus everything in [requirements-dev.txt](./python-flask/requirements-dev.txt) - `frontend`: Base on `flask` above, with everything from [requirements-frontend.txt](./python-flask-dev/requirements-frontend.txt) installed ## Workflows @@ -11,6 +11,6 @@ Contains requirements files for different versions of a python flask app. The [D # Future Improvements - Make the workflow just use all tags in the tags file, not hard code them? -- If we add other base images besides [python-flask-dev](./python-flask-dev/), make the workflow use a matrix approach so it builds all of these? +- If we add other base images besides [python-flask](./python-flask/), make the workflow use a matrix approach so it builds all of these? - Are we using the right tag names? - Stop using pip-compile and use rye? diff --git a/python-flask/tags b/python-flask/tags index dd3ad9d..d4236d8 100644 --- a/python-flask/tags +++ b/python-flask/tags @@ -1,3 +1,4 @@ PYTHON_FLASK_DEV_FLASK=flask-3.0.3 PYTHON_FLASK_DEV_JINJA=jinja-3.1.0 -PYTHON_FLASK_DEV_PY=3.10-bullseye \ No newline at end of file +PYTHON_FLASK_DEV_PY=3.10-bullseye +PYTHON_FLASK_DEV_SQL_ALCHEMY=sqlalchemy-2.0.30 \ No newline at end of file