From 85e296f99ec0ab47939f85465661a697da0f1211 Mon Sep 17 00:00:00 2001
From: Michael Barz <mbarz@owncloud.com>
Date: Mon, 30 Sep 2024 22:59:42 +0200
Subject: [PATCH] fix: improve docker compose

---
 deployments/examples/ocis_full/collabora.yml                    | 1 +
 .../examples/ocis_full/debug-collaboration-collabora.yml        | 2 ++
 .../examples/ocis_full/debug-collaboration-onlyoffice.yml       | 2 ++
 deployments/examples/ocis_full/onlyoffice.yml                   | 1 +
 ocis/docker/Dockerfile.linux.debug.amd64                        | 2 +-
 5 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/deployments/examples/ocis_full/collabora.yml b/deployments/examples/ocis_full/collabora.yml
index 1bbdc3e11..101f44f71 100644
--- a/deployments/examples/ocis_full/collabora.yml
+++ b/deployments/examples/ocis_full/collabora.yml
@@ -35,6 +35,7 @@ services:
       COLLABORATION_APP_INSECURE: "${INSECURE:-true}"
       COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}"
       COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info}
+      OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
     volumes:
       # configure the .env file to use own paths instead of docker internal volumes
       - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis
diff --git a/deployments/examples/ocis_full/debug-collaboration-collabora.yml b/deployments/examples/ocis_full/debug-collaboration-collabora.yml
index dd8fd49a4..0ba450a73 100644
--- a/deployments/examples/ocis_full/debug-collaboration-collabora.yml
+++ b/deployments/examples/ocis_full/debug-collaboration-collabora.yml
@@ -3,5 +3,7 @@ services:
 
   collaboration:
     command: [ "-c", "dlv --listen=:40000 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis collaboration server" ]
+    environment:
+      COLLABORATION_LOG_LEVEL: debug
     ports:
       - 40001:40000
diff --git a/deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml b/deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml
index 0adc78a44..ce6e7aa7f 100644
--- a/deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml
+++ b/deployments/examples/ocis_full/debug-collaboration-onlyoffice.yml
@@ -3,5 +3,7 @@ services:
 
   collaboration-oo:
     command: [ "-c", "dlv --listen=:40002 --headless=true --continue --check-go-version=false --api-version=2 --accept-multiclient exec /usr/bin/ocis collaboration server" ]
+    environment:
+      COLLABORATION_LOG_LEVEL: debug
     ports:
       - 40002:40002
diff --git a/deployments/examples/ocis_full/onlyoffice.yml b/deployments/examples/ocis_full/onlyoffice.yml
index 4fba4ac60..c3c6b0f8c 100644
--- a/deployments/examples/ocis_full/onlyoffice.yml
+++ b/deployments/examples/ocis_full/onlyoffice.yml
@@ -32,6 +32,7 @@ services:
       COLLABORATION_CS3API_DATAGATEWAY_INSECURE: "${INSECURE:-true}"
       COLLABORATION_LOG_LEVEL: ${LOG_LEVEL:-info}
       COLLABORATION_APP_PROOF_DISABLE: "true"
+      OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
     volumes:
       # configure the .env file to use own paths instead of docker internal volumes
       - ${OCIS_CONFIG_DIR:-ocis-config}:/etc/ocis
diff --git a/ocis/docker/Dockerfile.linux.debug.amd64 b/ocis/docker/Dockerfile.linux.debug.amd64
index 59fc57185..cbf46d49b 100644
--- a/ocis/docker/Dockerfile.linux.debug.amd64
+++ b/ocis/docker/Dockerfile.linux.debug.amd64
@@ -1,4 +1,4 @@
-FROM amd64/alpine:3.19
+FROM amd64/alpine:latest
 
 ARG VERSION=""
 ARG REVISION=""