fix conflict

.devcontainer/Dockerfile

@@ -3,7 +3,8 @@
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
-FROM mcr.microsoft.com/dotnet/sdk:6.0
+FROM mcr.microsoft.com/dotnet/sdk:7.0
+
 
 # This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
 # property in devcontainer.json to use it. On Linux, the container user's GID/UIDs

.devcontainer/devcontainer.json

@@ -25,15 +25,22 @@
     // Comment out to connect as root user. See https://aka.ms/vscode-remote/containers/non-root.
     // make sure this is the same as USERNAME above
     "remoteUser": "vscode",
+    "runArgs": [
+        "-v",
+        "/var/run/docker.sock:/var/run/docker.sock"
+    ],
+	// Set *default* container specific settings.json values on container create.
+	"settings": {
+        "terminal.integrated.profiles.linux": {
+            "bash": {
+                "path": "bash",
+                "icon": "terminal-bash"
+            }
+        }
+	},
 
-    // Set *default* container specific settings.json values on container create.
-    "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
-    },
-
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": [
-        "ms-azuretools.azure-dev",
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
         "ms-dotnettools.csharp",
         "formulahendry.dotnet-test-explorer",
         "ms-vscode.vscode-node-azure-pack",