Merge main and dev

.github/workflows/deploy_test.yml

@@ -1,20 +1,8 @@
 name: Deploy to TDT4242 server development
 
 on:
-
   push:
     branches: ["development"]
-  workflow_dispatch:
-    inputs:
-      config:
-        description: "Which compose config file to deploy"
-        required: true
-        default: "docker-compose.dev.yml"
-        type: choice
-        options:
-          - "docker-compose.dev.yml"
-          - "docker-compose.stag.yml"
-          - "docker-compose.yml"
 
 jobs:
   deploy:
@@ -37,10 +25,10 @@ jobs:
           env
           docker compose version
           cd $GITHUB_WORKSPACE
-          docker compose -f $COMPOSE_FILE --verbose config  && printf "OK\n" || exit 1
+          docker compose -f docker-compose.dev.yml --verbose config  && printf "OK\n" || exit 1
           
       - name: Build and run docker image 
-        run: docker compose -f $COMPOSE_FILE up --force-recreate --build -d
+        run: docker compose -f docker-compose.dev.yml up --force-recreate --build -d
 
       - name: Verify that gateway is available
         run: docker ps