From 1d54976b1175664fa781c8a60a9a76d291f9e06d Mon Sep 17 00:00:00 2001 From: ben0i0d Date: Fri, 6 Dec 2024 20:03:07 +0800 Subject: [PATCH] add vscode-extensions & C --- .gitea/workflows/Flow.yaml | 25 ++++++++++++++++- GS/mc/be/Dockerfile | 1 + GS/mc/be/be_here | 0 Program/c/.devcontainer/devcontainer.json | 14 ++++++++++ Program/c/Dockerfile | 7 +++++ Program/cpp/.devcontainer/devcontainer.json | 25 +++++++---------- Program/cpp/Dockerfile | 2 +- .../java/jdk/.devcontainer/devcontainer.json | 27 ++++++++----------- Program/js/.devcontainer/devcontainer.json | 25 +++++++---------- Program/julia/.devcontainer/devcontainer.json | 25 +++++++---------- .../python/.devcontainer/devcontainer.json | 26 +++++++----------- Program/r/.devcontainer/devcontainer.json | 23 +++++++--------- README.md | 17 ++++++------ README_CN.md | 17 ++++++------ base/cpu/.devcontainer/devcontainer.json | 17 ++---------- base/rocm/.devcontainer/devcontainer.json | 16 ++--------- 16 files changed, 129 insertions(+), 138 deletions(-) create mode 100644 GS/mc/be/Dockerfile delete mode 100644 GS/mc/be/be_here create mode 100644 Program/c/.devcontainer/devcontainer.json create mode 100644 Program/c/Dockerfile diff --git a/.gitea/workflows/Flow.yaml b/.gitea/workflows/Flow.yaml index ee34a05..fbc1560 100644 --- a/.gitea/workflows/Flow.yaml +++ b/.gitea/workflows/Flow.yaml @@ -66,6 +66,18 @@ jobs: https_proxy=http://192.168.2.2:7890 tags: eoelab.org:1027/${{ gitea.repository }}:rocm + C: + runs-on: runner + needs: Base + steps: + - name: checkout code + uses: https://eoelab.org:1027/actions/checkout@v4 + - name: c build + uses: https://eoelab.org:1027/actions/build-push-action@v6 + with: + context: Program/c + tags: eoelab.org:1027/${{ gitea.repository }}:c + Cpp: runs-on: runner needs: Base @@ -88,7 +100,7 @@ jobs: uses: https://eoelab.org:1027/actions/build-push-action@v6 with: context: Program/java/jdk - tags: eoelab.org:1027/${{ gitea.repository }}:java + tags: eoelab.org:1027/${{ gitea.repository }}:jdk JRE: runs-on: runner @@ -151,6 +163,17 @@ jobs: context: Program/r tags: eoelab.org:1027/${{ gitea.repository }}:r + MC_BE: + runs-on: runner + needs: Base + steps: + - name: checkout code + uses: https://eoelab.org:1027/actions/checkout@v4 + - name: mc_be build + uses: https://eoelab.org:1027/actions/build-push-action@v6 + with: + context: GS/mc/be + tags: eoelab.org:1027/${{ gitea.repository }}:mc_be MC_JRE_8: runs-on: runner diff --git a/GS/mc/be/Dockerfile b/GS/mc/be/Dockerfile new file mode 100644 index 0000000..2c9f708 --- /dev/null +++ b/GS/mc/be/Dockerfile @@ -0,0 +1 @@ +FROM eoelab.org:1027/ben0i0d/cenv:base \ No newline at end of file diff --git a/GS/mc/be/be_here b/GS/mc/be/be_here deleted file mode 100644 index e69de29..0000000 diff --git a/Program/c/.devcontainer/devcontainer.json b/Program/c/.devcontainer/devcontainer.json new file mode 100644 index 0000000..646ea6d --- /dev/null +++ b/Program/c/.devcontainer/devcontainer.json @@ -0,0 +1,14 @@ +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian +{ + "name": "c", + + "image": "docker.io/ben0i0d/cenv:c", + + // Configure vscode-extensions. + "customizations": { + "vscode": { + "extensions": ["formulahendry.code-runner", "ms-vscode.cpptools-extension-pack"] + } + } +} \ No newline at end of file diff --git a/Program/c/Dockerfile b/Program/c/Dockerfile new file mode 100644 index 0000000..e4653fc --- /dev/null +++ b/Program/c/Dockerfile @@ -0,0 +1,7 @@ +FROM eoelab.org:1027/ben0i0d/cenv:base + +USER root + +RUN apt-get update --yes && apt-get install --yes gcc gdb cmake && apt-get clean && rm -rf /var/lib/apt/lists/* + +WORKDIR "${HOME}" \ No newline at end of file diff --git a/Program/cpp/.devcontainer/devcontainer.json b/Program/cpp/.devcontainer/devcontainer.json index 29ba65f..f6a2d2f 100644 --- a/Program/cpp/.devcontainer/devcontainer.json +++ b/Program/cpp/.devcontainer/devcontainer.json @@ -1,19 +1,14 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "cpp", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "docker.io/ben0i0d/cenv:cpp" + + "image": "docker.io/ben0i0d/cenv:cpp", - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" + // Configure vscode-extensions. + "customizations": { + "vscode": { + "extensions": ["formulahendry.code-runner", "ms-vscode.cpptools-extension-pack"] + } + } } \ No newline at end of file diff --git a/Program/cpp/Dockerfile b/Program/cpp/Dockerfile index 873363f..2b9933e 100644 --- a/Program/cpp/Dockerfile +++ b/Program/cpp/Dockerfile @@ -2,6 +2,6 @@ FROM eoelab.org:1027/ben0i0d/cenv:base USER root -RUN apt-get update --yes && apt-get install --yes --no-install-recommends g++ gdb cmake && apt-get clean && rm -rf /var/lib/apt/lists/* +RUN apt-get update --yes && apt-get install --yes g++ gdb cmake && apt-get clean && rm -rf /var/lib/apt/lists/* WORKDIR "${HOME}" \ No newline at end of file diff --git a/Program/java/jdk/.devcontainer/devcontainer.json b/Program/java/jdk/.devcontainer/devcontainer.json index 46a5cb6..0265d18 100644 --- a/Program/java/jdk/.devcontainer/devcontainer.json +++ b/Program/java/jdk/.devcontainer/devcontainer.json @@ -1,19 +1,14 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "java", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "docker.io/ben0i0d/cenv:java" - - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" + + "image": "docker.io/ben0i0d/cenv:java", + + // Configure vscode-extensions. + "customizations": { + "vscode": { + "extensions": ["vscjava.vscode-java-pack"] + } + } } \ No newline at end of file diff --git a/Program/js/.devcontainer/devcontainer.json b/Program/js/.devcontainer/devcontainer.json index 4950c36..8744f0b 100644 --- a/Program/js/.devcontainer/devcontainer.json +++ b/Program/js/.devcontainer/devcontainer.json @@ -1,19 +1,14 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "JS", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "docker.io/ben0i0d/cenv:js" + + "image": "docker.io/ben0i0d/cenv:js", - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" + // Configure vscode-extensions. + "customizations": { + "vscode": { + "extensions": ["ms-vscode.vscode-typescript-next"] + } + } } \ No newline at end of file diff --git a/Program/julia/.devcontainer/devcontainer.json b/Program/julia/.devcontainer/devcontainer.json index 42c2e02..4ad0714 100644 --- a/Program/julia/.devcontainer/devcontainer.json +++ b/Program/julia/.devcontainer/devcontainer.json @@ -1,19 +1,14 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "julia", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "docker.io/ben0i0d/cenv:julia" + + "image": "docker.io/ben0i0d/cenv:julia", - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" + // Configure vscode-extensions. + "customizations": { + "vscode": { + "extensions": ["julialang.language-julia"] + } + } } \ No newline at end of file diff --git a/Program/python/.devcontainer/devcontainer.json b/Program/python/.devcontainer/devcontainer.json index b1492f8..e05ea0b 100644 --- a/Program/python/.devcontainer/devcontainer.json +++ b/Program/python/.devcontainer/devcontainer.json @@ -1,19 +1,13 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "python", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "docker.io/ben0i0d/cenv:python" - - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" + + "image": "docker.io/ben0i0d/cenv:python", + // Configure vscode-extensions. + "customizations": { + "vscode": { + "extensions": ["ms-python.python", "donjayamanne.python-environment-manager", "ms-python.vscode-pylance", "ms-toolsai.jupyter"] + } + } } \ No newline at end of file diff --git a/Program/r/.devcontainer/devcontainer.json b/Program/r/.devcontainer/devcontainer.json index f1b0032..427e878 100644 --- a/Program/r/.devcontainer/devcontainer.json +++ b/Program/r/.devcontainer/devcontainer.json @@ -1,19 +1,14 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "r", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "docker.io/ben0i0d/cenv:r" - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, + "image": "docker.io/ben0i0d/cenv:r", - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // Configure tool-specific properties. - // "customizations": {}, - - // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root. - // "remoteUser": "root" + // Configure vscode-extensions. + "customizations": { + "vscode": { + "extensions": ["reditorsupport.r", "rdebugger.r-debugger"] + } + } } \ No newline at end of file diff --git a/README.md b/README.md index f13e8e0..02f18fb 100644 --- a/README.md +++ b/README.md @@ -36,14 +36,15 @@ CUDA-->B ROCM-->B B-->P{PROGRAM} -P-->PA(Cpp) -P-->PB(Java) -PB-->PBA(Jdk) -PB-->PBB(Jre) -P-->PC(Js) -P-->PD(Julia) -P-->PE(Python) -P-->PF(R) +P-->PA(C) +P-->PB(Cpp) +P-->PC(Java) +PC-->PCA(Jdk) +PC-->PCB(Jre) +P-->PD(Js) +P-->PE(Julia) +P-->PF(Python) +P-->PG(R) B-->G{GameServer}-->GA{MC}-->GAA(JAVA) GAA-->GAAA(JRE_8) diff --git a/README_CN.md b/README_CN.md index f387016..24e7a96 100644 --- a/README_CN.md +++ b/README_CN.md @@ -36,14 +36,15 @@ CUDA-->B ROCM-->B B-->P{PROGRAM} -P-->PA(Cpp) -P-->PB(Java) -PB-->PBA(Jdk) -PB-->PBB(Jre) -P-->PC(Js) -P-->PD(Julia) -P-->PE(Python) -P-->PF(R) +P-->PA(C) +P-->PB(Cpp) +P-->PC(Java) +PC-->PCA(Jdk) +PC-->PCB(Jre) +P-->PD(Js) +P-->PE(Julia) +P-->PF(Python) +P-->PG(R) B-->G{GameServer}-->GA{MC}-->GAA(JAVA) GAA-->GAAA(JRE_8) diff --git a/base/cpu/.devcontainer/devcontainer.json b/base/cpu/.devcontainer/devcontainer.json index 3bea26a..12b4d9b 100644 --- a/base/cpu/.devcontainer/devcontainer.json +++ b/base/cpu/.devcontainer/devcontainer.json @@ -1,19 +1,6 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "base", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "image": "docker.io/ben0i0d/cenv:base" - - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // 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 diff --git a/base/rocm/.devcontainer/devcontainer.json b/base/rocm/.devcontainer/devcontainer.json index dbae2e1..5df4ce5 100644 --- a/base/rocm/.devcontainer/devcontainer.json +++ b/base/rocm/.devcontainer/devcontainer.json @@ -1,19 +1,7 @@ -// For format details, see https://aka.ms/devcontainer.json. For config options, see the -// README at: https://github.com/devcontainers/templates/tree/main/src/debian +// For format details, see https://aka.ms/devcontainer.json. +// For config options, see the README at: https://github.com/devcontainers/templates/tree/main/src/debian { "name": "rocm", - // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile "image": "eoelab.org:1027/ben0i0d/cenv:rocm", "runArgs": ["--device","/dev/kfd", "--device","/dev/dri", "--security-opt", "seccomp=unconfined", "--shm-size","4G"] - // Features to add to the dev container. More info: https://containers.dev/features. - // "features": {}, - - // Use 'forwardPorts' to make a list of ports inside the container available locally. - // "forwardPorts": [], - - // 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