From 61b196aa4068030dfa3721be3f0da717e3b11907 Mon Sep 17 00:00:00 2001 From: ben0i0d Date: Sun, 8 Dec 2024 20:15:46 +0800 Subject: [PATCH] add hexo --- .gitea/workflows/Flow.yaml | 12 ++++++++++++ CI/hexo/Dockerfile | 5 +++++ Program/js/Dockerfile | 3 ++- README.md | 28 +++++++++++++++++----------- README_CN.md | 28 +++++++++++++++++----------- 5 files changed, 53 insertions(+), 23 deletions(-) create mode 100644 CI/hexo/Dockerfile diff --git a/.gitea/workflows/Flow.yaml b/.gitea/workflows/Flow.yaml index fbc1560..efdeb5a 100644 --- a/.gitea/workflows/Flow.yaml +++ b/.gitea/workflows/Flow.yaml @@ -127,6 +127,18 @@ jobs: context: Program/js tags: eoelab.org:1027/${{ gitea.repository }}:js + Hexo: + runs-on: runner + needs: JS + steps: + - name: checkout code + uses: https://eoelab.org:1027/actions/checkout@v4 + - name: hexo build + uses: https://eoelab.org:1027/actions/build-push-action@v6 + with: + context: CI/hexo + tags: eoelab.org:1027/${{ gitea.repository }}:hexo + Python: runs-on: runner needs: Base diff --git a/CI/hexo/Dockerfile b/CI/hexo/Dockerfile new file mode 100644 index 0000000..69f54d5 --- /dev/null +++ b/CI/hexo/Dockerfile @@ -0,0 +1,5 @@ +FROM eoelab.org:1027/ben0i0d/cenv:js + +RUN apt-get update --yes && apt-get install --yes --no-install-recommends git && apt-get clean && rm -rf /var/lib/apt/lists/* && \ + npm install hexo-cli hexo-deployer-git -g && \ + npm cache clean --force \ No newline at end of file diff --git a/Program/js/Dockerfile b/Program/js/Dockerfile index 8895692..644f75a 100644 --- a/Program/js/Dockerfile +++ b/Program/js/Dockerfile @@ -1,3 +1,4 @@ FROM eoelab.org:1027/ben0i0d/cenv:base -RUN apt-get update --yes && apt-get install --yes --no-install-recommends nodejs npm && apt-get clean && rm -rf /var/lib/apt/lists/* \ No newline at end of file +RUN apt-get update --yes && apt-get install --yes --no-install-recommends nodejs npm && apt-get clean && rm -rf /var/lib/apt/lists/* && \ + npm config set registry https://registry.npmmirror.com \ No newline at end of file diff --git a/README.md b/README.md index 4f1bd47..a01b86b 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,9 @@ English | [中文](README_CN.md) `cp -r .devcontainer WORKSDIR` ## Image dependencies +* `Program` : development environment, primarily serving the devcontainer. +* `CI` : CI job environment +* `GS` : game server ```mermaid graph LR @@ -35,6 +38,20 @@ CPU-->B{Base} CUDA-->B ROCM-->B +B-->C{CI} +C-->CA(Hexo) + +B-->G{GS}-->GA{MC}-->GAA(JAVA) +GAA-->GAAA(JRE_8) +GAA-->GAAB(JRE_11) +GAA-->GAAC(JRE_17) +GAA-->GAAD(JRE_21) + +G-->GB{MCSM}-->GBA(Web) +GB-->GBB(Daemon) + +G-->GC(steam)-->GCA(steam_wine) + B-->P{PROGRAM} P-->PA(C) P-->PB(Cpp) @@ -45,17 +62,6 @@ P-->PD(Js) P-->PE(Julia) P-->PF(Python) P-->PG(R) - -B-->G{GameServer}-->GA{MC}-->GAA(JAVA) -GAA-->GAAA(JRE_8) -GAA-->GAAB(JRE_11) -GAA-->GAAC(JRE_17) -GAA-->GAAD(JRE_21) - -G-->GB{MCSM}-->GBA(Web) -GB-->GBB(Daemon) - -G-->GC(steam)-->GCA(steam_wine) ``` ## Upstream * NVIDIA: https://gitlab.com/nvidia/container-images/cuda diff --git a/README_CN.md b/README_CN.md index d3a7af7..e311d4a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -28,6 +28,9 @@ English | [中文](README_CN.md) `cp -r .devcontainer WORKSDIR` ## 镜像依赖 +* `Program`:开发环境,主要为devcontainer +* `CI`:CI作业环境, +* `GS`:游戏服务器 ```mermaid graph LR @@ -35,6 +38,20 @@ CPU-->B{Base} CUDA-->B ROCM-->B +B-->C{CI} +C-->CA(Hexo) + +B-->G{GS}-->GA{MC}-->GAA(JAVA) +GAA-->GAAA(JRE_8) +GAA-->GAAB(JRE_11) +GAA-->GAAC(JRE_17) +GAA-->GAAD(JRE_21) + +G-->GB{MCSM}-->GBA(Web) +GB-->GBB(Daemon) + +G-->GC(steam)-->GCA(steam_wine) + B-->P{PROGRAM} P-->PA(C) P-->PB(Cpp) @@ -45,17 +62,6 @@ P-->PD(Js) P-->PE(Julia) P-->PF(Python) P-->PG(R) - -B-->G{GameServer}-->GA{MC}-->GAA(JAVA) -GAA-->GAAA(JRE_8) -GAA-->GAAB(JRE_11) -GAA-->GAAC(JRE_17) -GAA-->GAAD(JRE_21) - -G-->GB{MCSM}-->GBA(Web) -GB-->GBB(Daemon) - -G-->GC(steam)-->GCA(steam_wine) ``` ## 镜像源