diff --git a/CHANGELOG.md b/CHANGELOG.md index 69fc77e..f745787 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## [2.1.0](https://github.com/chaos-zhu/easynode/releases) (2024-08-02) + +### Features + +* 支持脚本库功能 ✔ +* 支持批量指令下发功能 ✔ +* 重写Dockerfile,大幅减少镜像体积 ✔ +* 调整优化面板UI ✔ + ## [2.0.0](https://github.com/chaos-zhu/easynode/releases) (2024-07-29) ### Features diff --git a/Dockerfile b/Dockerfile index d062a23..e1fcd57 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,23 @@ -FROM node:20.16-alpine3.20 -WORKDIR /easynode -COPY . . +FROM node:20.16-alpine3.20 AS builder_web +WORKDIR /easynode/web +COPY ./web . +COPY yarn.lock . +RUN yarn +RUN yarn build +# RUN find ../server/app/static -type f ! -name '.gitkeep' -exec rm -f {} + +# RUN mv dist/* ../server/app/static + +# 在这里加上builder_server +FROM node:20.16-alpine3.20 AS builder_server +WORKDIR /easynode/server +COPY ./server . +COPY yarn.lock . +COPY --from=builder_web /easynode/web/dist ./app/static RUN yarn -WORKDIR /easynode/web -RUN yarn build -RUN find ../server/app/static -type f ! -name '.gitkeep' -exec rm -f {} + -RUN mv dist/* ../server/app/static - -WORKDIR /easynode/server +FROM node:20.16-alpine3.20 +WORKDIR /easynode +COPY --from=builder_server /easynode/server . ENV HOST 0.0.0.0 EXPOSE 8082 -CMD [ "npm", "start" ] +CMD ["npm", "start"] diff --git a/README.md b/README.md index 7b7e806..bdb58c5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ > [!NOTE] > 客户端信息监控与webssh功能都将以`该服务器作为中转`。中国大陆连接建议使用香港、新加坡、日本、韩国等地区的低延迟服务器来安装服务端 - - [功能](#功能) + ## 功能 @@ -27,14 +27,13 @@ - [x] 实例分组 - [x] 凭据托管 - [x] 邮件通知 -- [x] 实例状态推送 +- [x] 服务器状态推送 - [x] 脚本库 -- [ ] 批量指令(开发中) +- [x] 批量指令 +- [ ] 终端自定义 - 实例面板 -![实例面板](./doc_images/v2.0-1.jpg) -- 终端&sftp -![终端&sftp](./doc_images/v2.0-2.jpg) +![实例面板](./doc_images/merge.gif) ## 安装 diff --git a/doc_images/1..jpg b/doc_images/1..jpg new file mode 100644 index 0000000..e5fe908 Binary files /dev/null and b/doc_images/1..jpg differ diff --git a/doc_images/2.jpg b/doc_images/2.jpg new file mode 100644 index 0000000..5382b4a Binary files /dev/null and b/doc_images/2.jpg differ diff --git a/doc_images/3.jpg b/doc_images/3.jpg new file mode 100644 index 0000000..4f6cbfa Binary files /dev/null and b/doc_images/3.jpg differ diff --git a/doc_images/4.jpg b/doc_images/4.jpg new file mode 100644 index 0000000..c7ae503 Binary files /dev/null and b/doc_images/4.jpg differ diff --git a/doc_images/merge.gif b/doc_images/merge.gif new file mode 100644 index 0000000..5504b6a Binary files /dev/null and b/doc_images/merge.gif differ diff --git a/doc_images/v2.0-1.jpg b/doc_images/v2.0-1.jpg deleted file mode 100644 index 57a812a..0000000 Binary files a/doc_images/v2.0-1.jpg and /dev/null differ diff --git a/doc_images/v2.0-2.jpg b/doc_images/v2.0-2.jpg deleted file mode 100644 index a1d6497..0000000 Binary files a/doc_images/v2.0-2.jpg and /dev/null differ diff --git a/web/src/views/terminal/components/terminal.vue b/web/src/views/terminal/components/terminal.vue index c9df37c..7b7cdd5 100644 --- a/web/src/views/terminal/components/terminal.vue +++ b/web/src/views/terminal/components/terminal.vue @@ -61,7 +61,7 @@