From 34b69979a2222f5f35a33e1371e0de4ca75fd950 Mon Sep 17 00:00:00 2001
From: battye <administration@online-scrabble.com>
Date: Thu, 25 Sep 2025 15:41:19 +0200
Subject: [PATCH] [ticket/17544] Changes from review

PHPBB-17544
---
 .devcontainer/customisations-team/devcontainer.json |  2 +-
 .devcontainer/customisations-team/setup.sh          | 10 +++-------
 .devcontainer/development-team/devcontainer.json    |  2 +-
 .devcontainer/development-team/setup.sh             |  8 ++------
 4 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/.devcontainer/customisations-team/devcontainer.json b/.devcontainer/customisations-team/devcontainer.json
index 5a0803656e..1e418d5242 100644
--- a/.devcontainer/customisations-team/devcontainer.json
+++ b/.devcontainer/customisations-team/devcontainer.json
@@ -5,7 +5,7 @@
 	"build": {
 		"dockerfile": "../Dockerfile",
 		"args": { 
-			"VARIANT": "ubuntu-22.04"
+			"VARIANT": "ubuntu-24.04"
 		}
 	},
 
diff --git a/.devcontainer/customisations-team/setup.sh b/.devcontainer/customisations-team/setup.sh
index 5511a2eb54..a29d5681b6 100644
--- a/.devcontainer/customisations-team/setup.sh
+++ b/.devcontainer/customisations-team/setup.sh
@@ -10,10 +10,6 @@ sudo service mysql start
 echo "[Codespaces] Start Apache"
 sudo apache2ctl start
 
-# Add SSH key
-# echo "[Codespaces] Add SSH key"
-# echo "$SSH_KEY" > /home/vscode/.ssh/id_rsa && chmod 600 /home/vscode/.ssh/id_rsa
-
 # Create a MySQL user to use
 echo "[Codespaces] Create MySQL user"
 sudo mysql -u root<<EOFMYSQL
@@ -37,13 +33,13 @@ if [ "$CODESPACES" = true ] ; then
 fi
 
 URL_EPV="https://github.com/phpbb/epv"
-URL_TV="https://github.com/battye/phpbb-translation-validator"
-URL_TITANIA="https://github.com/battye/customisation-db.git"
+URL_TV="https://github.com/phpbb/phpbb-translation-validator"
+URL_TITANIA="https://github.com/phpbb/customisation-db.git"
 
 # Install Titania
 echo "[Codespaces] Install Titania"
 cd /workspaces/
-git clone -b 3.3.x-phpbb-codespaces $URL_TITANIA titania
+git clone -b oberon $URL_TITANIA titania
 cd /workspaces/titania
 chmod 755 files store
 composer install --no-interaction
diff --git a/.devcontainer/development-team/devcontainer.json b/.devcontainer/development-team/devcontainer.json
index 729eb1c48e..aebc9e1331 100644
--- a/.devcontainer/development-team/devcontainer.json
+++ b/.devcontainer/development-team/devcontainer.json
@@ -5,7 +5,7 @@
 	"build": {
 		"dockerfile": "../Dockerfile",
 		"args": { 
-			"VARIANT": "ubuntu-22.04"
+			"VARIANT": "ubuntu-24.04"
 		}
 	},
 
diff --git a/.devcontainer/development-team/setup.sh b/.devcontainer/development-team/setup.sh
index dfcfc742fe..70fdf0bf6d 100644
--- a/.devcontainer/development-team/setup.sh
+++ b/.devcontainer/development-team/setup.sh
@@ -10,10 +10,6 @@ sudo service mysql start
 echo "[Codespaces] Start Apache"
 sudo apache2ctl start
 
-# Add SSH key
-# echo "[Codespaces] Add SSH key"
-# echo "$SSH_KEY" > /home/vscode/.ssh/id_rsa && chmod 600 /home/vscode/.ssh/id_rsa
-
 # Create a MySQL user to use
 echo "[Codespaces] Create MySQL user"
 sudo mysql -u root<<EOFMYSQL
@@ -23,8 +19,8 @@ sudo mysql -u root<<EOFMYSQL
 EOFMYSQL
 
 # Download dependencies
-# echo "[Codespaces] Install Composer dependencies"
-# composer install --no-interaction
+echo "[Codespaces] Install Composer dependencies"
+composer install --no-interaction
 
 # Symlink the webroot so it can be viewed
 echo "[Codespaces] Create Symlink of webroot"