From: Robin Windey <ro.windey@gmail.com>
Date: Mon, 14 Nov 2022 10:40:42 +0000 (+0000)
Subject: Fix devcontainer url
X-Git-Tag: v26.0.0beta1~373^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0776f849472f8eca0e1caa99374968cd54640912;p=nextcloud-server.git

Fix devcontainer url

See also:
* https://github.com/community/community/discussions/5104#discussioncomment-2217052
* https://docs.github.com/en/codespaces/developing-in-codespaces/default-environment-variables-for-your-codespace#list-of-default-environment-variables
---

diff --git a/.devcontainer/codespace.config.php b/.devcontainer/codespace.config.php
index 2818a760edb..5d883c3c9df 100644
--- a/.devcontainer/codespace.config.php
+++ b/.devcontainer/codespace.config.php
@@ -1,6 +1,7 @@
 <?php
 
-$cloudEnvironmentId = getenv('CLOUDENV_ENVIRONMENT_ID');
+$codespaceName = getenv('CODESPACE_NAME');
+$codespaceDomain = getenv('GITHUB_CODESPACES_PORT_FORWARDING_DOMAIN');
 
 $CONFIG = [
     'mail_from_address' => 'no-reply',
@@ -12,7 +13,7 @@ $CONFIG = [
     'memcache.local' => '\OC\Memcache\APCu',
 ];
 
-if($cloudEnvironmentId !== true) {
-    $CONFIG['overwritehost'] = $cloudEnvironmentId . '-80.apps.codespaces.githubusercontent.com';
+if(is_string($codespaceName) && !empty($codespaceName) && is_string($codespaceDomain) && !empty($codespaceDomain)) {
+    $CONFIG['overwritehost'] = $codespaceName . '-80.' . $codespaceDomain;
     $CONFIG['overwriteprotocol'] = 'https';
 }