diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index a4d0506..46bcf86 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -24,6 +24,4 @@ jobs: uses: docker/build-push-action@v6 with: push: true - tags: | - code.edgarpierre.fr/${{ github.repository }}:${{ github.ref_name }} - code.edgarpierre.fr/${{ github.repository }}:latest + tags: code.edgarpierre.fr/${{ github.repository }}:${{ github.ref_name }} diff --git a/compose.yaml b/compose.yaml index 6a35721..de60602 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1,6 +1,6 @@ services: nummi: - image: code.edgarpierre.fr/edpibu/nummi + image: code.edgarpierre.fr/edpibu/nummi:main container_name: nummi restart: unless-stopped ports: diff --git a/nummi/nummi/settings.py b/nummi/nummi/settings.py index c9f7900..1050bab 100644 --- a/nummi/nummi/settings.py +++ b/nummi/nummi/settings.py @@ -22,7 +22,6 @@ 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/" @@ -125,7 +124,7 @@ USE_TZ = True # https://docs.djangoproject.com/en/4.0/howto/static-files/ STATIC_URL = "static/" -STATIC_ROOT = STATIC_CONF.get("root", "/srv/nummi") +STATIC_ROOT = "/srv/nummi" LOGIN_URL = "login" # Default primary key field type