Test version management fix and embed

.github/workflows/build-and-push-tmp.yml

@@ -0,0 +1,92 @@
+# Move to ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@main in the future
+name: Build and Push Docker Image
+
+on:
+  workflow_call:
+    inputs:
+      image-name:
+        type: string
+        default: ${{ github.repository }}
+        description: "The name for the docker image (Default: Repository name)"
+      docker-file:
+        type: string
+        default: Dockerfile
+        description: "The path to the Dockerfile (Default: ./Dockerfile)"
+      docker-context:
+        type: string
+        default: .
+        description: "The context for the Docker build (Default: .)"
+      build-args:
+        type: string
+        description: "List of additional build contexts (e.g., name=path)"
+        required: false
+      platforms:
+        type: string
+        description: "List of platforms for which to build the image"
+        default: linux/amd64,linux/arm64
+      registry:
+        type: string
+        default: ghcr.io
+        description: "The registry to push the image to (Default: ghcr.io)"
+
+    secrets:
+      registry-user:
+        required: false
+      registry-password:
+        required: false
+
+    outputs:
+      image-tag:
+        description: "The tag of the pushed image"
+        value: ${{ jobs.build.outputs.image-tag }}
+jobs:
+  build:
+    name: Build Docker Image for ${{ inputs.image-name }}
+    runs-on: ubuntu-latest
+    outputs:
+      image-tag: ${{ steps.set-tag.outputs.image-tag }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+
+      - name: Install Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ inputs.registry }}
+          username: ${{ secrets.registry-user || github.actor }}
+          password: ${{ secrets.registry-password || secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ inputs.registry }}/${{ inputs.image-name }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=ref,event=branch
+            type=ref,event=pr
+
+      - name: Set image tag output
+        id: set-tag
+        run: echo "::set-output name=image-tag::${{ steps.meta.outputs.version }}"    
+
+      - name: Build and push Docker Image
+        uses: docker/build-push-action@v6
+        with:
+          context: ${{ inputs.docker-context }}
+          file: ${{ inputs.docker-file }}
+          platforms: ${{ inputs.platforms }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: ${{ inputs.build-args }}
+          push: true

.github/workflows/build-and-push.yml

@@ -0,0 +1,18 @@
+name: Build Docker Image
+
+on:
+  workflow_call:
+    outputs:
+      image-tag:
+        description: "The tag of the pushed image"
+        value: ${{ jobs.build-and-push-workflow.outputs.image-tag }}
+
+jobs:
+  build-and-push-workflow:
+    name: Build and Push Docker Image
+    # uses: ls1intum/.github/.github/workflows/build-and-push-docker-image.yml@main
+    uses: ./.github/workflows/build-and-push-tmp.yml
+    with:
+      image-name:  ls1intum/apollon_standalone
+      docker-file: Dockerfile.redis
+    secrets: inherit

.github/workflows/deploy-docker.yml

@@ -0,0 +1,103 @@
+name: Deploy Docker Image
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        required: true
+        type: string
+      image-name:
+        type: string
+        default: ${{ github.repository }}
+        description: "The name for the docker image (Default: Repository name)"
+      image-tag:
+        default: "latest"
+        type: string
+        description: "The tag for the docker image (Default: latest)"
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment: 
+      name: ${{ inputs.environment }}
+      url: 'https://${{ vars.SERVER_HOST }}'
+    steps:
+      - name: SSH to VM and Execute Docker-Compose Down (if exists)
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ vars.VM_HOST }}
+          username: ${{ vars.VM_USERNAME }}
+          key: ${{ secrets.VM_SSH_PRIVATE_KEY }}
+          proxy_host: ${{ vars.DEPLOYMENT_GATEWAY_HOST }}
+          proxy_username: ${{ vars.DEPLOYMENT_GATEWAY_USER }}
+          proxy_key: ${{ secrets.DEPLOYMENT_GATEWAY_SSH_KEY }}
+          proxy_port: ${{ vars.DEPLOYMENT_GATEWAY_PORT }}
+          script: |
+            #!/bin/bash
+            set -e  # Exit immediately if a command exits with a non-zero status
+
+            COMPOSE_FILE="docker-compose.prod.yml"
+            ENV_FILE=".env.prod"
+
+            # Check if docker-compose.prod.yml exists
+            if [ -f "$COMPOSE_FILE" ]; then
+              echo "$COMPOSE_FILE found."
+
+              # Check if .env.prod exists
+              if [ -f "$ENV_FILE" ]; then
+                docker compose -f "$COMPOSE_FILE" --env-file="$ENV_FILE" down --remove-orphans --rmi all
+              else
+                docker compose -f "$COMPOSE_FILE" down --remove-orphans --rmi all
+              fi
+            else
+              echo "$COMPOSE_FILE does not exist. Skipping docker compose down."
+            fi
+
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Copy Docker Compose File From Repo to VM Host
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ vars.VM_HOST }}
+          username: ${{ vars.VM_USERNAME }}
+          key: ${{ secrets.VM_SSH_PRIVATE_KEY }}
+          proxy_host: ${{ vars.DEPLOYMENT_GATEWAY_HOST }}
+          proxy_username: ${{ vars.DEPLOYMENT_GATEWAY_USER }}
+          proxy_key: ${{ secrets.DEPLOYMENT_GATEWAY_SSH_KEY }}
+          proxy_port: ${{ vars.DEPLOYMENT_GATEWAY_PORT }}
+          source: "./docker-compose.prod.yml"
+          target: /home/${{ vars.VM_USERNAME }}
+
+      - name: SSH to VM and create .env.prod file
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ vars.VM_HOST }}
+          username: ${{ vars.VM_USERNAME }}
+          key: ${{ secrets.VM_SSH_PRIVATE_KEY }}
+          proxy_host: ${{ vars.DEPLOYMENT_GATEWAY_HOST }}
+          proxy_username: ${{ vars.DEPLOYMENT_GATEWAY_USER }}
+          proxy_key: ${{ secrets.DEPLOYMENT_GATEWAY_SSH_KEY }}
+          proxy_port: ${{ vars.DEPLOYMENT_GATEWAY_PORT }}
+          script: |
+            touch .env.prod 
+
+            echo "ENVIRONMENT=${{ vars.ENVIRONMENT }}" > .env.prod
+
+            echo "DEPLOYMENT_URL=${{ vars.DEPLOYMENT_URL }}" > .env.prod
+            echo "APOLLON_REDIS_DIAGRAM_TTL=${{ vars.APOLLON_REDIS_DIAGRAM_TTL }}" >> .env.prod
+
+            echo "IMAGE_TAG=${{ inputs.image-tag }}" >> .env.prod
+
+      - name: SSH to VM and Execute Docker-Compose Up
+        uses: appleboy/[email protected]
+        with:
+          host: ${{ vars.VM_HOST }}
+          username: ${{ vars.VM_USERNAME }}
+          key: ${{ secrets.VM_SSH_PRIVATE_KEY }}
+          proxy_host: ${{ vars.DEPLOYMENT_GATEWAY_HOST }}
+          proxy_username: ${{ vars.DEPLOYMENT_GATEWAY_USER }}
+          proxy_key: ${{ secrets.DEPLOYMENT_GATEWAY_SSH_KEY }}
+          proxy_port: ${{ vars.DEPLOYMENT_GATEWAY_PORT }}
+          script: |
+            docker compose -f docker-compose.prod.yml --env-file=.env.prod up --pull=always -d

.github/workflows/dev.yml

@@ -0,0 +1,18 @@
+name: Build and Deploy to Dev
+
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  build-dev-container:
+    uses: ./.github/workflows/build-and-push.yml
+    secrets: inherit
+  deploy-dev-container:
+    needs: build-dev-container
+    uses: ./.github/workflows/deploy-docker.yml
+    secrets: inherit
+    with:
+      environment: Dev
+      image-name: ls1intum/apollon_standalone
+      image-tag: "${{ needs.build-dev-container.outputs.image-tag }}"

Dockerfile.redis

@@ -7,11 +7,9 @@ RUN apk add --no-cache \
   pango-dev \
   giflib-dev
 
-
-ARG DEPLOYMENT_URL="http://localhost:8080"
-
-ENV APOLLON_REDIS_URL=""
-ENV DEPLOYMENT_URL=${DEPLOYMENT_URL}
+ENV DEPLOYMENT_URL="http://localhost:8080"
+ENV APOLLON_REDIS_URL="redis://localhost:6379"
+ENV APOLLON_REDIS_DIAGRAM_TTL="30d"
 
 WORKDIR /app