This commit is contained in:
parent
3cf4bc8c38
commit
feb6ecb22c
2
a_th_web
2
a_th_web
|
|
@ -1 +1 @@
|
||||||
Subproject commit 91faaa0728b98b42483e763922303c5765d88c82
|
Subproject commit 59fc0d763460c2984a8f740ebe1633f8b060d868
|
||||||
|
|
@ -45,6 +45,13 @@ if [ -d "docker/nginx/html/dist" ]; then
|
||||||
echo "docker/nginx/html/dist 清理完成"
|
echo "docker/nginx/html/dist 清理完成"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -d "docker/hyf/html/dist" ]; then
|
||||||
|
echo "清理 docker/hyf/html/dist 文件夹..."
|
||||||
|
rm -rf docker/hyf/html/dist/*
|
||||||
|
echo "docker/hyf/html/dist 清理完成"
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# 清理 docker 目录下的所有 .jar 文件
|
# 清理 docker 目录下的所有 .jar 文件
|
||||||
if [ -d "docker" ]; then
|
if [ -d "docker" ]; then
|
||||||
echo "清理 docker 目录下的所有 .jar 文件..."
|
echo "清理 docker 目录下的所有 .jar 文件..."
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,9 @@ cp ../sql/ry_config_20250902.sql ./mysql/db
|
||||||
echo "begin copy html "
|
echo "begin copy html "
|
||||||
cp -r ../ruoyi-ui/dist/** ./nginx/html/dist
|
cp -r ../ruoyi-ui/dist/** ./nginx/html/dist
|
||||||
|
|
||||||
|
echo "begin copy hyf html "
|
||||||
|
cp -r ../a_th_web/dist/** ./a_th_web/html/dist
|
||||||
|
|
||||||
|
|
||||||
# copy jar
|
# copy jar
|
||||||
echo "begin copy ruoyi-gateway "
|
echo "begin copy ruoyi-gateway "
|
||||||
|
|
|
||||||
|
|
@ -69,14 +69,14 @@ services:
|
||||||
container_name: ruoyi-hyf
|
container_name: ruoyi-hyf
|
||||||
image: hyf-runtime
|
image: hyf-runtime
|
||||||
build:
|
build:
|
||||||
context: ./nginx
|
context: ./a_th_web
|
||||||
ports:
|
ports:
|
||||||
- "9988:80"
|
- "9988:80"
|
||||||
volumes:
|
volumes:
|
||||||
- ./nginx/html/dist:/home/ruoyi/projects/ruoyi-ui
|
- ./a_th_web/html/dist:/home/ruoyi/projects/ruoyi-ui
|
||||||
- ./nginx/conf/nginx.conf:/etc/nginx/nginx.conf
|
- ./a_th_web/conf/nginx.conf:/etc/nginx/nginx.conf
|
||||||
- ./nginx/logs:/var/log/nginx
|
- ./a_th_web/logs:/var/log/nginx
|
||||||
- ./nginx/conf.d:/etc/nginx/conf.d
|
- ./a_th_web/conf.d:/etc/nginx/conf.d
|
||||||
depends_on:
|
depends_on:
|
||||||
- ruoyi-gateway
|
- ruoyi-gateway
|
||||||
links:
|
links:
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit ae8dd1783ae479fbe803e27147a0da4354476c1e
|
Subproject commit c09cd603b4dabc14ef48f7eea2a7dfbf52e7f642
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit d735138af013a4771b120712b975d61fafcc1899
|
Subproject commit b9d746ed86acfed5d552ae955a510354501c9db3
|
||||||
2
ruoyi-ui
2
ruoyi-ui
|
|
@ -1 +1 @@
|
||||||
Subproject commit 7bbf2530a7e7f7892cb429654aa57ae87494887d
|
Subproject commit 3cf007642c2ab2a2c10300171e62b7a250dfee57
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 193d44c620e6348d987c7a9f07c7da8ae2feda64
|
Subproject commit bf44098e8a690c4671829f16711d1d7f10d1a8fa
|
||||||
Loading…
Reference in New Issue