From b4d523ad3427aa9453fc0979546546b8abf36edb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20Pether=20S=C3=B6rling?=
 <pethers@users.noreply.github.com>
Date: Sun, 12 Jan 2025 23:02:02 +0100
Subject: [PATCH] feat(devcontainer): update Dockerfile for Chrome installation
 and remove deprecated launch configurations (#7014)

---
 .devcontainer/Dockerfile        |  3 ++-
 .devcontainer/devcontainer.json | 18 -----------------
 .vscode/launch.json             | 36 ---------------------------------
 .vscode/tasks.json              | 22 --------------------
 4 files changed, 2 insertions(+), 77 deletions(-)
 delete mode 100644 .vscode/launch.json
 delete mode 100644 .vscode/tasks.json

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 3bb04bd73d..ba23ffe292 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,7 +3,7 @@ FROM mcr.microsoft.com/devcontainers/java:21-bookworm
 # Install all packages in a single layer to reduce image size
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
-    && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list \
+    && echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
     && apt-get update \
     && apt-get -y install --no-install-recommends \
     graphviz \
@@ -28,6 +28,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     libnss3 \
     libgbm1 \
     libasound2 \
+    libxtst6 \
     && sh -c 'echo "deb [signed-by=/usr/share/keyrings/postgres-archive-keyring.gpg] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/postgresql.list' \
     && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor -o /usr/share/keyrings/postgres-archive-keyring.gpg \
     && apt-get update \
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index e7835d1c84..6f0d402a0e 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -52,24 +52,6 @@
     "sonarlint.rules": {
       "java:S106": "off"
     },
-    "launch": {
-      "configurations": [
-        {
-          "type": "java",
-          "name": "Launch CIA Server",
-          "request": "launch",
-          "mainClass": "com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer",
-          "projectName": "citizen-intelligence-agency",
-          "cwd": "${workspaceFolder}/citizen-intelligence-agency",
-          "vmArgs": "-Xmx8192m -Xms2048m -XX:+UseG1GC",
-          "classpath": [
-            "${workspaceFolder}/citizen-intelligence-agency/target/test-classes",
-            "${workspaceFolder}/citizen-intelligence-agency/target/classes"
-          ]
-        }
-      ],
-      "compounds": []
-    },
     "tasks": {
       "version": "2.0.0",
       "tasks": [
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index 4da75e83cb..0000000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "type": "java",
-      "name": "CitizenIntelligenceAgencyServer",
-      "request": "launch",
-      "mainClass": "com.hack23.cia.web/com.hack23.cia.systemintegrationtest.CitizenIntelligenceAgencyServer",
-      "projectName": "citizen-intelligence-agency"
-    },
-    {
-      "type": "java",
-      "name": "Debug Application",
-      "request": "launch",
-      "mainClass": "${workspaceFolder}/src/main/java/com/hack23/cia/CitizenIntelligenceAgencyApplication.java",
-      "projectName": "cia",
-      "env": {
-        "SPRING_PROFILES_ACTIVE": "dev"
-      },
-      "vmArgs": [
-        "-Xms1024m",
-        "-Xmx2048m",
-        "-XX:+UseG1GC",
-        "--add-opens=java.base/java.lang=ALL-UNNAMED",
-        "--add-opens=java.base/java.util=ALL-UNNAMED"
-      ]
-    },
-    {
-      "type": "java",
-      "name": "Debug (Attach)",
-      "request": "attach",
-      "hostName": "localhost",
-      "port": 5005
-    }
-  ]
-}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index 88d981a45e..0000000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"version": "2.0.0",
-	"tasks": [
-		{
-			"type": "java (build)",
-			"paths": [
-				"${workspace}"
-			],
-			"isFullBuild": true,
-			"group": "build",
-			"problemMatcher": [],
-			"label": "java (build): Build Workspace",
-			"detail": "$(tools) Build all the Java projects in workspace.",
-			"options": {
-				"env": {
-					"JAVA_OPTS": "-Xmx8192m -Xms2048m -XX:+UseG1GC",
-					"MAVEN_OPTS": "-Xmx8192m -Xms2048m -XX:+UseG1GC"
-				}
-			}
-		}
-	]
-}
\ No newline at end of file