Merge branch 'main' into stable

.env.template

@@ -1,16 +1,17 @@
 # use 'stable' for production deployment
-ARACHNE_IMAGE_VERSION=latest
-# remove when using external db
-COMPOSE_PROFILES=with-db
+ARACHNE_FRONTEND_IMAGE_VERSION=latest
+ARACHNE_BACKEND_IMAGE_VERSION=latest
 
-# may be set to external db server
-DB_SERVER=db
 DB_ROOT_PASSWORD=
 DB_PASSWORD=
 
-SERVER_ADDRESS=localhost:8080
+SMTP_USER_NAME=
+SMTP_USER_PASSWORD=
 
-ARCHAEOCLOUD_PASSWORD=
+SERVER_ADDRESS=
+HOST_NAME=
+
+ARCHAEOCLOUD_PATH=/mnt/cephfs/archaeocloud/
 
 AIAX_VERSION=latest
-AIAX_DATA_DIR=./aiax-data
+AIAX_DATA_DIR=./aiax-data

.github/workflows/backend.yml

@@ -8,6 +8,8 @@ on:
     branches:
       - main
       - stable
+      - gwdg_deployment
+      - cologne_deployment
 
 defaults:
   run:
@@ -38,5 +40,5 @@ jobs:
         with:
           context: "backend"
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref == 'refs/heads/stable' && 'stable' || 'latest' }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/frontend-build.yml

@@ -48,6 +48,6 @@ jobs:
         with:
           context: "frontend"
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref == 'refs/heads/stable' && 'stable' || 'latest' }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: BUILD_NO=${{ github.run_number }}

.gitignore

@@ -1,3 +1,4 @@
 .env
 letsencrypt/
-aiax-data/
+aiax-data/
+db_data/