Merge branch 'dev' into 'main'

Attempt to fix pipeline

See merge request wlinator/Racu!15

.env.template

@@ -9,10 +9,6 @@ DBX_OAUTH2_REFRESH_TOKEN=
 DBX_APP_KEY=
 DBX_APP_SECRET=
 
-CI_REGISTRY_USER=wlinator
-CI_REGISTRY_PASSWORD=
-CI_REGISTRY_IMAGE=registry.gitlab.com/wlinator/Racu
-
 MARIADB_USER=
 MARIADB_PASSWORD=
 MARIADB_ROOT_PASSWORD=

.gitlab-ci.yml

@@ -1,16 +1,36 @@
-stages:
+# To contribute improvements to CI/CD templates, please follow the Development guide at:
-  - build
+# https://docs.gitlab.com/ee/development/cicd/templates.html
+# This specific template is located at:
+# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
 
-docker_build:
+# Build a Docker image with CI/CD and push to the GitLab registry.
+# Docker-in-Docker documentation: https://docs.gitlab.com/ee/ci/docker/using_docker_build.html
+#
+# This template uses one generic job with conditional builds
+# for the default branch and all other (MR) branches.
+
+docker-build:
+  # Use the official docker image.
+  image: docker:cli
   stage: build
-  image: docker:latest
   services:
     - docker:dind
+  variables:
+    DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
+  before_script:
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  # All branches are tagged with $DOCKER_IMAGE_NAME (defaults to commit ref slug)
+  # Default branch is also tagged with `latest`
   script:
-    - docker build -t Racu .
+    - docker build --pull -t "$DOCKER_IMAGE_NAME" .
-    - source .env  # Load environment variables from .env
+    - docker push "$DOCKER_IMAGE_NAME"
-    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - |
-    - git fetch --tags  # Fetch Git tags
+      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
-    - TAG=$(git describe --tags --abbrev=0)  # Get the latest Git tag
+        docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:latest"
-    - docker tag my-python-app $CI_REGISTRY_IMAGE:$TAG  # Tag the image with the Git tag
+        docker push "$CI_REGISTRY_IMAGE:latest"
-    - docker push $CI_REGISTRY_IMAGE:$TAG  # Push the tagged image
+      fi
+  # Run this job in a branch where a Dockerfile exists
+  rules:
+    - if: $CI_COMMIT_BRANCH
+      exists:
+        - Dockerfile