From 116ac7038f81871bbde2b4dd327bceb605e8dbd4 Mon Sep 17 00:00:00 2001
From: zhiqiang feng <fengzhq@it2000.com.cn>
Date: Tue, 20 Feb 2024 09:49:34 +0000
Subject: [PATCH] Update devcontainer configuration

---
 .devcontainer/devcontainer-lock.json |  9 ++++
 .devcontainer/devcontainer.json      | 65 ++++++++++++++++++++--------
 2 files changed, 55 insertions(+), 19 deletions(-)
 create mode 100644 .devcontainer/devcontainer-lock.json

diff --git a/.devcontainer/devcontainer-lock.json b/.devcontainer/devcontainer-lock.json
new file mode 100644
index 00000000..47d13819
--- /dev/null
+++ b/.devcontainer/devcontainer-lock.json
@@ -0,0 +1,9 @@
+{
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "1.4.0",
+      "resolved": "ghcr.io/devcontainers/features/java@sha256:4f8e435b36600538d84fb7f1d798c36dd5c766e7522ec0d179a1c040492ba1d7",
+      "integrity": "sha256:4f8e435b36600538d84fb7f1d798c36dd5c766e7522ec0d179a1c040492ba1d7"
+    }
+  }
+}
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3989e8dd..b91363f4 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,27 +1,54 @@
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.128.0/containers/java-8
+// // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
+// // https://github.com/microsoft/vscode-dev-containers/tree/v0.128.0/containers/java-8
+// {
+// 	"name": "ChengDu Airport MsgExchange",
+// 	"dockerFile": "Dockerfile",
+
+// 	// Set *default* container specific settings.json values on container create.
+// 	"settings": {
+// 		"terminal.integrated.shell.linux": "/bin/bash",
+// 		"java.home": "/docker-java-home"
+// 	},
+
+// 	// Add the IDs of extensions you want installed when the container is created.
+// 	"extensions": [
+// 		"vscjava.vscode-java-pack",
+// 		"streetsidesoftware.code-spell-checker"
+// 	],
+
+// 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+// 	"forwardPorts": [8080],
+
+// 	// Use 'postCreateCommand' to run commands after the container is created.
+// 	// "postCreateCommand": "java -version",
+
+// 	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+// 	"remoteUser": "vscode"
+// }
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/java
 {
-	"name": "ChengDu Airport MsgExchange",
-	"dockerFile": "Dockerfile",
+	"name": "Java",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/java:1-8-bullseye",
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash",
-		"java.home": "/docker-java-home"
-	},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"vscjava.vscode-java-pack",
-		"streetsidesoftware.code-spell-checker"
-	],
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+			"version": "none",
+			"installMaven": true,
+			"installGradle": false
+		}
+	}
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [8080],
+	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
 	// "postCreateCommand": "java -version",
 
-	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-	"remoteUser": "vscode"
-}
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}
\ No newline at end of file