From 6b63d7ca86f785a6bddbab611778ff83608f152b Mon Sep 17 00:00:00 2001 From: skyboy Date: Tue, 27 Aug 2024 16:30:38 +0800 Subject: [PATCH] change readme --- Dockerfile | 28 ++++++++-------------------- README.md | 10 +++++----- frontend/src/system/initBuiltin.ts | 6 +++--- 3 files changed, 16 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 43845d1..06b3318 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,7 @@ # docker build --no-cache -t godoos/godoos:latest . -# docker run -it --rm -p 56780:56780 -p 8185:80 godoos/godoos:latest -# 使用 golang:alpine 作为构建阶段的基础镜像 +# docker run -it --rm -p 56780:56780 godoos/godoos:latest +# docker push godoos/godoos:latest +# 使用 golang:alpine 作为基础镜像 FROM golang:alpine AS builder # 在容器内部设置环境变量 @@ -8,7 +9,7 @@ ENV GO111MODULE=on \ GOPROXY=https://goproxy.cn,direct \ CGO_ENABLED=0 \ GOOS=linux \ - GOARCH=amd64 + GOARCH=amd64 \ GODOTOPTYPE=docker # 设置后续指令的工作目录 @@ -20,25 +21,12 @@ COPY . . # 将代码编译成二进制可执行文件 RUN go build -o godoos ./godo/main.go -# 创建一个小镜像 -FROM nginx:alpine +# 创建最终镜像 +FROM alpine # 设置工作目录 WORKDIR / -# 更改镜像源 -RUN echo 'http://mirrors.aliyun.com/alpine/v3.19/main' > /etc/apk/repositories && \ - echo 'http://mirrors.aliyun.com/alpine/v3.19/community' >> /etc/apk/repositories - -# 复制前端构建结果到 nginx 的默认文档目录 -COPY --from=builder /build/frontend/dist /usr/share/nginx/html - -# 替换默认的 nginx 配置文件 -COPY docker/nginx.conf /etc/nginx/conf.d/ - -# 暴露 nginx 默认端口 -EXPOSE 80 - # 从builder镜像中把 /build/godoos 拷贝到当前目录 COPY --from=builder /build/godoos /godoos @@ -51,5 +39,5 @@ EXPOSE 56780 # 需要运行的命令 USER root -# 启动 Nginx 和 godoos 服务 -CMD ["sh", "-c", "nginx -g 'daemon off;' & /godoos"] \ No newline at end of file +# 直接启动 Go 应用程序 +CMD ["/godoos"] \ No newline at end of file diff --git a/README.md b/README.md index 487e1e1..f2a5042 100644 --- a/README.md +++ b/README.md @@ -36,8 +36,8 @@ 2. 💼 **MacOS 用户**: -- MacOS (AMD64) [**Web版**](https://gitee.com/ruitao_admin/godoos/releases/download/1.0.1/godoos_darwin_amd64.zip) -- MacOS (ARM64) [**Web版**](https://gitee.com/ruitao_admin/godoos/releases/download/1.0.1/godoos_darwin_arm64.zip) +- MacOS (AMD64) [**Web版**](https://gitee.com/ruitao_admin/godoos/releases/download/1.0.1/godoos_darwin_amd64.zip) [**桌面版**](https://gitee.com/ruitao_admin/godoos/releases/download/1.0.1/godoos-darwin-amd64-installer.zip) +- MacOS (ARM64) [**Web版**](https://gitee.com/ruitao_admin/godoos/releases/download/1.0.1/godoos_darwin_arm64.zip) [**桌面版**](https://gitee.com/ruitao_admin/godoos/releases/download/1.0.1/godoos-darwin-arm64-installer.zip) 3. 💽 **Linux 用户**: @@ -46,9 +46,9 @@ - 备注:如需桌面版请自行打包 -### 🚢 **Docker安装(v1.0.0)** +### 🚢 **Docker安装(v1.0.1)** ``` -docker run -d -p 56780:56780 -p 8185:80 --name godoos godoos/godoos:latest +docker run -d -p 56780:56780 --name godoos godoos/godoos:latest ``` - 访问地址:http://localhost:8185/ - 如果设置本地存储,存储地址为 /root/.godoos/os,设置成功后保存,点左下角win图标->关机图标->恢复->恢复出厂设置 @@ -61,7 +61,7 @@ docker run -d -p 56780:56780 -p 8185:80 --name godoos godoos/godoos:latest - ***无需联网使用,全开源*** - ***零配置,无需注册,下载即用*** - ***零污染,无插件依赖*** -- ***精小,打包后仅65M,却包含了所有的办公套件*** +- ***精小,打包后仅70M,却包含了所有的办公套件*** - ***可无限扩展,支持自定义应用*** - ***golang开发后端,低资源消耗和高性能*** - ***支持多平台,Windows、Linux、MacOS*** diff --git a/frontend/src/system/initBuiltin.ts b/frontend/src/system/initBuiltin.ts index 0e73583..9989808 100644 --- a/frontend/src/system/initBuiltin.ts +++ b/frontend/src/system/initBuiltin.ts @@ -103,13 +103,13 @@ export function initBuiltinFileOpener(system: System) { hiddenInChosen: true, func: (path: string, content: string) => { console.log(path) - console.log(content) - console.log(JSON.stringify(system._rootState.windowMap)) + // console.log(content) + // console.log(JSON.stringify(system._rootState.windowMap)) const exeContent = content.split("::"); const winopt = system._rootState.windowMap[exeContent[1]].get( exeContent[2] ); - console.log(winopt) + //console.log(winopt) if (winopt) { if (winopt.multiple ?? true) { const win = new BrowserWindow(winopt.window);