add db tag

communitiesuk · Jul 12, 2024 · 0fcbee0 · 0fcbee0
1 parent 4e66b69
commit 0fcbee0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -3,14 +3,14 @@ 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
 - [Publish](/.github/workflows/publish.yml): Uses a matrix strategy to build each target in the Dockerfile and publish these to GHCR. If on `main`, will tag them as specified in [tags](./python-flask-dev/tags). (At present if you add something to tags you also need to add to [publish.yml](./.github/workflows/publish.yml)).
 
 # 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
@@ -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
+PYTHON_FLASK_DEV_PY=3.10-bullseye
+PYTHON_FLASK_DEV_SQL_ALCHEMY=sqlalchemy-2.0.30