diff --git a/Dockerfile b/docker/Dockerfile similarity index 83% rename from Dockerfile rename to docker/Dockerfile index 2ddf8de..7a3a08e 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -39,7 +39,7 @@ RUN cd /backend/restagent && go build -o backend -v -ldflags "-X 'ems.agt/lib/gl ## 镜像基座 ====> 编译输出前后端可运行的程序 FROM alpine -## 安装时区工具 +## 安装工具 RUN apk add --no-cache tzdata nginx openssh \ && ssh-keygen -A \ && adduser -D omc \ @@ -52,13 +52,19 @@ ENV TZ="Asia/Shanghai" ENV LANG="en_US.UTF-8" WORKDIR /usr/local/omc -# 分步编译 + +# 前端编译 COPY --from=build-nodejs /frontend/dist /usr/local/omc/bin/frontend +RUN touch /usr/local/omc/bin/frontend/config.js + +# 后端编译 COPY --from=build-go /backend/restagent/backend /usr/local/omc/bin/backend -# 配置文件 -COPY ./backend/docker/config.yaml /usr/local/omc/etc/config.yaml -COPY ./backend/docker/nginx.conf /etc/nginx/nginx.conf + +# 其余文件 +COPY ./backend/docker/omc/etc/omc.yaml /usr/local/omc/etc/omc.yaml +COPY ./backend/docker/omc/nginx/nginx.conf /etc/nginx/nginx.conf +COPY ./backend/docker/omc/static /usr/local/omc/static EXPOSE 22 80 3030 -CMD ["/bin/sh", "-c", "/usr/sbin/sshd && nginx && /usr/local/omc/bin/backend --env prod -c /usr/local/omc/etc/config.yaml"] +CMD ["/bin/sh", "-c", "/usr/sbin/sshd && nginx && /usr/local/omc/bin/backend --env prod -c /usr/local/omc/etc/omc.yaml"] diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000..49c6cb4 --- /dev/null +++ b/docker/README.md @@ -0,0 +1,22 @@ +## Docker 编译 + +docker build --build-arg VERSION=2.240111 -t omc:2.240111 . + +docker run -it omc:2.240111 sh + +-v /var/log/omc +-v /etc/nginx +-v /usr/local/omc/etc +-v /usr/local/omc/static +-v /usr/local/omc/upload + +docker run -d \ +--privileged=true \ +--restart=always \ +-p 3222:22 \ +-p 3280:80 \ +-p 3230:3030 \ +-e TZ="Asia/Shanghai" \ +-m 512M \ +--name omc_001 \ +omc:2.240111 diff --git a/docker/config.yaml b/docker/omc/etc/omc.yaml similarity index 100% rename from docker/config.yaml rename to docker/omc/etc/omc.yaml diff --git a/docker/nginx.conf b/docker/omc/nginx/nginx.conf similarity index 100% rename from docker/nginx.conf rename to docker/omc/nginx/nginx.conf diff --git a/docker/omc/static/helpDoc/en_doc.pdf b/docker/omc/static/helpDoc/en_doc.pdf new file mode 100644 index 0000000..ab34753 Binary files /dev/null and b/docker/omc/static/helpDoc/en_doc.pdf differ diff --git a/docker/omc/static/helpDoc/zh_doc.pdf b/docker/omc/static/helpDoc/zh_doc.pdf new file mode 100644 index 0000000..ae25c3d Binary files /dev/null and b/docker/omc/static/helpDoc/zh_doc.pdf differ diff --git a/docker/omc/static/logo/en_brand.png b/docker/omc/static/logo/en_brand.png new file mode 100644 index 0000000..200025e Binary files /dev/null and b/docker/omc/static/logo/en_brand.png differ diff --git a/docker/omc/static/logo/en_icon.png b/docker/omc/static/logo/en_icon.png new file mode 100644 index 0000000..3ed445d Binary files /dev/null and b/docker/omc/static/logo/en_icon.png differ diff --git a/docker/omc/static/logo/zh_brand.png b/docker/omc/static/logo/zh_brand.png new file mode 100644 index 0000000..5810cf5 Binary files /dev/null and b/docker/omc/static/logo/zh_brand.png differ diff --git a/docker/omc/static/logo/zh_icon.png b/docker/omc/static/logo/zh_icon.png new file mode 100644 index 0000000..a5b6907 Binary files /dev/null and b/docker/omc/static/logo/zh_icon.png differ