diff --git a/README.md b/README.md index 4482e817..0eba7c57 100644 --- a/README.md +++ b/README.md @@ -34,8 +34,8 @@ gitee: https://gitee.com/lijiahangmax/orion-ops-pro 文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/ demo: http://101.43.254.243:1081/#/ -演示账号: `orionuser` -演示密码: `orionuser` +演示账号: `admin` +演示密码: `admin` 留个小星星再走吧⭐ ## 特性 diff --git a/docker-compose.yml b/docker-compose.yml index 56c809f3..ddd19be3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ version: '3.3' services: orion-ops-pro: - build: - context: . - dockerfile: docker/orion-ops-pro/Dockerfile + # build: + # context: . + # dockerfile: docker/orion-ops-pro/Dockerfile image: orion-ops-pro:1.0.0-beta.1 ports: - 1081:80 diff --git a/docker/orion-ops-pro/Dockerfile b/docker/orion-ops-pro/Dockerfile index a2c11c17..0065f5d4 100644 --- a/docker/orion-ops-pro/Dockerfile +++ b/docker/orion-ops-pro/Dockerfile @@ -8,8 +8,8 @@ RUN \ RUN apk add openjdk8 RUN rm -rf /etc/nginx/conf.d/* WORKDIR /app -COPY orion-ops-launch/target/orion-ops-launch.jar /app/app.jar -COPY orion-ops-ui/dist /usr/share/nginx/html -COPY docker/orion-ops-pro/entrypoint.sh /app/entrypoint.sh -COPY docker/orion-ops-pro/nginx.conf /etc/nginx/conf.d +COPY ../../orion-ops-launch/target/orion-ops-launch.jar /app/app.jar +COPY ../../orion-ops-ui/dist /usr/share/nginx/html +COPY ../../docker/orion-ops-pro/entrypoint.sh /app/entrypoint.sh +COPY ../../docker/orion-ops-pro/nginx.conf /etc/nginx/conf.d ENTRYPOINT [ "sh", "/app/entrypoint.sh" ] diff --git a/docs/README.md b/docs/README.md index a6d3881d..fa01eada 100644 --- a/docs/README.md +++ b/docs/README.md @@ -34,8 +34,8 @@ gitee: https://gitee.com/lijiahangmax/orion-ops-pro 文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/ demo: http://101.43.254.243:1081/#/ -演示账号: `orionuser` -演示密码: `orionuser` +演示账号: `admin` +演示密码: `admin` 留个小星星再走吧⭐ ## 特性 diff --git a/docs/about/change-log.md b/docs/about/change-log.md index d5c0881a..f6167f68 100644 --- a/docs/about/change-log.md +++ b/docs/about/change-log.md @@ -4,7 +4,7 @@ ## 1.0.0-beta.1 -`2024-03-01` `preview` +`2024-02-28` `preview` 🌈 主机管理 🌈 主机秘钥