From d6f6e8dc9fa58a6da860f186e84c29becc1b1afb Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Mon, 30 Aug 2021 09:34:29 +0200
Subject: [PATCH] adapt examples to non-root docker image

---
 .../examples/ocis_hello/config/ocis/entrypoint-override.sh  | 6 ++++--
 .../config/ocis/{config.dist.json => web-config.dist.json}  | 0
 deployments/examples/ocis_hello/docker-compose.yml          | 6 +++---
 .../examples/ocis_wopi/config/ocis/entrypoint-override.sh   | 6 ++++--
 .../config/ocis/{config.dist.json => web-config.dist.json}  | 0
 deployments/examples/ocis_wopi/docker-compose.yml           | 6 +++---
 6 files changed, 14 insertions(+), 10 deletions(-)
 rename deployments/examples/ocis_hello/config/ocis/{config.dist.json => web-config.dist.json} (100%)
 rename deployments/examples/ocis_wopi/config/ocis/{config.dist.json => web-config.dist.json} (100%)

diff --git a/deployments/examples/ocis_hello/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_hello/config/ocis/entrypoint-override.sh
index e8eead4439..d90e287a94 100644
--- a/deployments/examples/ocis_hello/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_hello/config/ocis/entrypoint-override.sh
@@ -2,8 +2,10 @@
 
 set -e
 
-cp /config/config.dist.json /config/config.json
-sed -i 's/ocis.owncloud.test/'${OCIS_DOMAIN:-ocis.owncloud.test}'/g' /config/config.json
+mkdir -p /var/tmp/ocis/.config/
+cp /config/proxy-config.json /var/tmp/ocis/.config/proxy-config.json
+cp /config/web-config.dist.json /var/tmp/ocis/.config/web-config.json
+sed -i 's/ocis.owncloud.test/'${OCIS_DOMAIN:-ocis.owncloud.test}'/g' /var/tmp/ocis/.config/web-config.json
 
 ocis server&
 sleep 10
diff --git a/deployments/examples/ocis_hello/config/ocis/config.dist.json b/deployments/examples/ocis_hello/config/ocis/web-config.dist.json
similarity index 100%
rename from deployments/examples/ocis_hello/config/ocis/config.dist.json
rename to deployments/examples/ocis_hello/config/ocis/web-config.dist.json
diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml
index 2e5bf8bfdb..9cbd68680d 100644
--- a/deployments/examples/ocis_hello/docker-compose.yml
+++ b/deployments/examples/ocis_hello/docker-compose.yml
@@ -61,12 +61,12 @@ services:
       OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
       OCIS_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret}
       # web ui
-      WEB_UI_CONFIG: "/config/config.json"
+      WEB_UI_CONFIG: "/var/tmp/ocis/.config/web-config.json"
       # proxy
-      PROXY_CONFIG_FILE: "/config/proxy-config.json"
+      PROXY_CONFIG_FILE: "/var/tmp/ocis/.config/proxy-config.json"
     volumes:
       - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh
-      - ./config/ocis/config.dist.json:/config/config.dist.json
+      - ./config/ocis/web-config.dist.json:/config/web-config.dist.json
       - ./config/ocis/proxy-config.json:/config/proxy-config.json
       - ocis-data:/var/tmp/ocis
     labels:
diff --git a/deployments/examples/ocis_wopi/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_wopi/config/ocis/entrypoint-override.sh
index e8eead4439..d90e287a94 100644
--- a/deployments/examples/ocis_wopi/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/ocis_wopi/config/ocis/entrypoint-override.sh
@@ -2,8 +2,10 @@
 
 set -e
 
-cp /config/config.dist.json /config/config.json
-sed -i 's/ocis.owncloud.test/'${OCIS_DOMAIN:-ocis.owncloud.test}'/g' /config/config.json
+mkdir -p /var/tmp/ocis/.config/
+cp /config/proxy-config.json /var/tmp/ocis/.config/proxy-config.json
+cp /config/web-config.dist.json /var/tmp/ocis/.config/web-config.json
+sed -i 's/ocis.owncloud.test/'${OCIS_DOMAIN:-ocis.owncloud.test}'/g' /var/tmp/ocis/.config/web-config.json
 
 ocis server&
 sleep 10
diff --git a/deployments/examples/ocis_wopi/config/ocis/config.dist.json b/deployments/examples/ocis_wopi/config/ocis/web-config.dist.json
similarity index 100%
rename from deployments/examples/ocis_wopi/config/ocis/config.dist.json
rename to deployments/examples/ocis_wopi/config/ocis/web-config.dist.json
diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml
index b30a4412ed..b595ce9c28 100644
--- a/deployments/examples/ocis_wopi/docker-compose.yml
+++ b/deployments/examples/ocis_wopi/docker-compose.yml
@@ -63,12 +63,12 @@ services:
       OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4}
       OCIS_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret}
       # web ui
-      WEB_UI_CONFIG: "/config/config.json"
+      WEB_UI_CONFIG: "/var/tmp/ocis/.config/web-config.json"
       # proxy
-      PROXY_CONFIG_FILE: "/config/proxy-config.json"
+      PROXY_CONFIG_FILE: "/var/tmp/ocis/.config/proxy-config.json"
     volumes:
       - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh
-      - ./config/ocis/config.dist.json:/config/config.dist.json
+      - ./config/ocis/web-config.dist.json:/config/web-config.dist.json
       - ./config/ocis/proxy-config.json:/config/proxy-config.json
       - ocis-data:/var/tmp/ocis
     labels: