From aee0883c85bf366a38490f01ca62010fe0460488 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Can=20Karag=C3=B6z?= <78308169+mckaragoz@users.noreply.github.com> Date: Wed, 4 Nov 2026 21:28:03 +0300 Subject: [PATCH 1/2] Enhance Docker Compose with logging and volume options Added logging configuration and updated volume permissions. --- .docker/docker-compose.identitylab.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.docker/docker-compose.identitylab.yml b/.docker/docker-compose.identitylab.yml index 00e178de..63621954 100644 --- a/.docker/docker-compose.identitylab.yml +++ b/.docker/docker-compose.identitylab.yml @@ -18,7 +18,7 @@ services: DataProtection__KeysPath: /app/keys volumes: - - /opt/identitylab/keys:/app/keys + - /opt/identitylab/keys:/app/keys:Z networks: - edge @@ -27,6 +27,12 @@ services: security_opt: - no-new-privileges:true + logging: + driver: json-file + options: + max-size: "10m" + max-file: "3" + networks: edge: external: true From 1e37ab64a70336d335e180a7990c204599a40de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Can=20Karag=C3=B6z?= <78308169+mckaragoz@users.noreply.github.com> Date: Wed, 4 Nov 2026 21:39:38 +0300 Subject: [PATCH 2/2] Enhance workflow with docker-compose upload step Added docker-compose file upload step to the workflow for Identity Lab deployment. --- .github/workflows/identitylab-image.yml | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/identitylab-image.yml b/.github/workflows/identitylab-image.yml index b569a7ba..d0df3b0f 100644 --- a/.github/workflows/identitylab-image.yml +++ b/.github/workflows/identitylab-image.yml @@ -7,6 +7,7 @@ on: - "src/**" - "samples/**" - ".docker/Dockerfile.identitylab" + - ".docker/docker-compose.identitylab.yml" - ".github/workflows/identitylab-image.yml" push: @@ -17,6 +18,7 @@ on: - "src/**" - "samples/**" - ".docker/Dockerfile.identitylab" + - ".docker/docker-compose.identitylab.yml" - ".github/workflows/identitylab-image.yml" workflow_dispatch: @@ -66,6 +68,19 @@ jobs: environment: identitylab steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Upload Identity Lab Compose + uses: appleboy/scp-action@v1 + with: + host: ${{ secrets.SERVER_HOST }} + username: ${{ secrets.SERVER_USER }} + key: ${{ secrets.SSH_PRIVATE_KEY }} + source: ".docker/docker-compose.identitylab.yml" + target: "/home/deploy/.identitylab-deploy/${{ github.sha }}" + strip_components: 1 + - name: Deploy Identity Lab uses: appleboy/ssh-action@v1.0.3 env: @@ -77,4 +92,10 @@ jobs: envs: IMAGE_TAG command_timeout: 10m script: | - sudo -n /usr/local/sbin/deploy-identitylab "$IMAGE_TAG" + SHA="${IMAGE_TAG##*:}" + COMPOSE_SOURCE="/home/deploy/.identitylab-deploy/$SHA/docker-compose.identitylab.yml" + + sudo -n /usr/local/sbin/deploy-identitylab \ + "$IMAGE_TAG" "$COMPOSE_SOURCE" + + rm -rf -- "/home/deploy/.identitylab-deploy/$SHA"