From 0e0da7f65841b573b33440d0c70b1546615604a7 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Thu, 8 May 2025 20:59:08 +0200 Subject: [PATCH 1/3] Update Docker build workflow to include latest tag in image push --- .forgejo/workflows/build.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index 46bcf86..a4d0506 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -24,4 +24,6 @@ jobs: uses: docker/build-push-action@v6 with: push: true - tags: code.edgarpierre.fr/${{ github.repository }}:${{ github.ref_name }} + tags: | + code.edgarpierre.fr/${{ github.repository }}:${{ github.ref_name }} + code.edgarpierre.fr/${{ github.repository }}:latest From 530e6eaf47fdb94bc61a2ed56b892a55b7bb8c81 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Thu, 8 May 2025 21:03:19 +0200 Subject: [PATCH 2/3] Refactor static file settings to use configuration for STATIC_ROOT --- nummi/nummi/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nummi/nummi/settings.py b/nummi/nummi/settings.py index 1050bab..c9f7900 100644 --- a/nummi/nummi/settings.py +++ b/nummi/nummi/settings.py @@ -22,6 +22,7 @@ if CONFIG_PATH is not None: # Build paths inside the project like this: BASE_DIR / 'subdir'. MEDIA_CONF = CONFIG.get("media", {}) +STATIC_CONF = CONFIG.get("static", {}) BASE_DIR = Path(__file__).resolve().parent.parent MEDIA_ROOT = Path(MEDIA_CONF.get("root", "/var/lib/nummi")) MEDIA_URL = "media/" @@ -124,7 +125,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/4.0/howto/static-files/ STATIC_URL = "static/" -STATIC_ROOT = "/srv/nummi" +STATIC_ROOT = STATIC_CONF.get("root", "/srv/nummi") LOGIN_URL = "login" # Default primary key field type From 100773c95815086ae1baa8f9813dabe392feabd8 Mon Sep 17 00:00:00 2001 From: "Edgar P. Burkhart" Date: Thu, 8 May 2025 21:03:28 +0200 Subject: [PATCH 3/3] Remove version tag from Nummi image in Docker Compose configuration --- compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yaml b/compose.yaml index de60602..6a35721 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: nummi: - image: code.edgarpierre.fr/edpibu/nummi:main + image: code.edgarpierre.fr/edpibu/nummi container_name: nummi restart: unless-stopped ports: