Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ APIKEY=${APIKEY}

# 部署配置 / Deployment configuration
# ModelEngine 开源版本号 / ModelEngine opensource version
VERSION=opensource-1.2.4
VERSION=opensource-1.3.0

# 用户自定义数据库密码 / User-configured database password
DB_PASSWORD=ModelEngine@123
Expand All @@ -25,4 +25,4 @@ WEB_PORT=8001
IS_UPGRADE=false

# 阿里云镜像仓 / Aliyun Cloud Image Repo
REPO="crpi-62znuv6vkgxcv731.cn-hangzhou.personal.cr.aliyuncs.com/modelengine-hub"
REPO="crpi-62znuv6vkgxcv731.cn-hangzhou.personal.cr.aliyuncs.com/modelengine-hub"
3 changes: 2 additions & 1 deletion docker/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
set -eux
export WORKSPACE=$(cd "$(dirname "$(readlink -f "$0")")" && pwd)

bash ${WORKSPACE}/import_model.sh
echo "=== Deploying... ==="
cd ${WORKSPACE}
mkdir -p app-platform-tmp/app-builder
Expand All @@ -13,5 +12,7 @@ echo "Starting service..."
docker-compose -p app-platform up -d
echo "Service started"
docker stop db-initializer
docker stop sql-initializer
docker rm db-initializer
docker rm sql-initializer
echo "=== Finished ==="
5 changes: 5 additions & 0 deletions docker/dev-app-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ if [ $WAITED -ge $MAX_WAIT ]; then
echo "Warning: Service startup timeout, but continuing execution..."
fi

docker stop db-initializer
docker stop sql-initializer
docker rm db-initializer
docker rm sql-initializer

echo ""
echo "=== Completed! ==="
echo "Development version deployed: ${DEV_VERSION}"
Expand Down
58 changes: 43 additions & 15 deletions docker/docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,36 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
LOG_HOME: /log/app
volumes:
- ./sql:/home/sql
- ./shell/initDB.sh:/home/initDB.sh
- "./app-platform-tmp/jade-db:/var/lib/postgresql/data"
- "./app-platform-tmp/log:/log/app/postgresql"
ports:
- "${DB_PORT}:5432"

sql-initializer:
container_name: sql-initializer
hostname: sql-initializer
image: ${REPO}/app-builder:dev-latest
networks:
my-net:
ipv4_address: 172.0.0.97
volumes:
- ./app-platform-tmp/sql:/opt/appbuilder/sql
entrypoint: ["/bin/bash", "-c"]
command: |
"
rm -rf /opt/appbuilder/sql/*
mv -f /opt/sql/* /opt/appbuilder/sql/
"

db-initializer:
container_name: db-initializer
hostname: db-initializer
image: ${REPO}/postgres:15.2-${VERSION}
depends_on:
jade-db:
condition: service_healthy
sql-initializer:
condition: service_completed_successfully
networks:
my-net:
ipv4_address: 172.0.0.99
Expand All @@ -39,13 +58,15 @@ services:
DB_PORT: 5432
DB_USER: postgres
IS_UPGRADE: ${IS_UPGRADE}
APIKEY: ${APIKEY}
volumes:
- ./shell/initDB.sh:/home/initDB.sh
- ./sql:/home/sql
entrypoint: ["/bin/bash", "-c"]
- ./app-platform-tmp/sql:/opt/sql
entrypoint: ["/bin/bash", "-c"]
command: |
" chmod +x /home/initDB.sh
bash /home/initDB.sh app_builder /home/sql
"
chmod +x /opt/initDB.sh
sed -i "s#TODO#${APIKEY}#g" /opt/sql/init/data/tr_init_models.sql
bash /opt/initDB.sh app_builder /opt/sql
"
restart: "no"

Expand All @@ -54,8 +75,8 @@ services:
hostname: app-builder
image: ${REPO}/app-builder:dev-latest
depends_on:
jade-db:
condition: service_healthy
db-initializer:
condition: service_completed_successfully
healthcheck:
test: ["CMD", "curl", "-f", "http://app-builder:8004/fit/check"]
interval: 30s
Expand All @@ -81,8 +102,15 @@ services:
LOG_HOME: /log/app
LOG_NUM: 4320
LOG_SIZE: "50M"
app-engine.ttl.businessData: 15
app-engine.ttl.nonBusinessData: 1
app-engine.ttl.businessData: 360
app-engine.ttl.nonBusinessData: 180
task.expiredDays: 360
model.imageExtractor.model: THUDM/GLM-4.1V-9B-Thinking
model.imageExtractor.url: https://api.siliconflow.cn/v1
model.audioTranscriptions.model: TeleAI/TeleSpeechASR
model.audioTranscriptions.url: https://api.siliconflow.cn/v1
model.imageExtractor.apiKey: ${APIKEY}
model.audioTranscriptions.apiKey: ${APIKEY}
volumes:
- "./app-platform-tmp/fit-runtime:/var/store/tools"
- "./app-platform-tmp/log:/log/app/app-builder"
Expand All @@ -97,7 +125,7 @@ services:
image: ${REPO}/fit-runtime-java:${VERSION}
depends_on:
app-builder:
condition: service_healthy
condition: service_healthy
networks:
my-net:
ipv4_address: 172.0.0.101
Expand All @@ -116,14 +144,14 @@ services:
- "./app-platform-tmp/log:/log/app/runtime-java"
ports:
- "8090:8090"

fit-runtime-python:
container_name: fit-runtime-python
hostname: fit-runtime-python
image: ${REPO}/fit-runtime-python:${VERSION}
depends_on:
app-builder:
condition: service_healthy
condition: service_healthy
networks:
my-net:
ipv4_address: 172.0.0.102
Expand All @@ -142,7 +170,7 @@ services:
- "./app-platform-tmp/log:/log/app/runtime-python"
ports:
- "9666:9666"

web:
container_name: web
hostname: web
Expand Down
58 changes: 43 additions & 15 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,36 @@ services:
POSTGRES_PASSWORD: ${DB_PASSWORD}
LOG_HOME: /log/app
volumes:
- ./sql:/home/sql
- ./shell/initDB.sh:/home/initDB.sh
- "./app-platform-tmp/jade-db:/var/lib/postgresql/data"
- "./app-platform-tmp/log:/log/app/postgresql"
ports:
- "${DB_PORT}:5432"

sql-initializer:
container_name: sql-initializer
hostname: sql-initializer
image: ${REPO}/app-builder:${VERSION}
networks:
my-net:
ipv4_address: 172.0.0.97
volumes:
- ./app-platform-tmp/sql:/opt/appbuilder/sql
entrypoint: ["/bin/bash", "-c"]
command: |
"
rm -rf /opt/appbuilder/sql/*
mv -f /opt/sql/* /opt/appbuilder/sql/
"

db-initializer:
container_name: db-initializer
hostname: db-initializer
image: ${REPO}/postgres:15.2-${VERSION}
depends_on:
jade-db:
condition: service_healthy
sql-initializer:
condition: service_completed_successfully
networks:
my-net:
ipv4_address: 172.0.0.99
Expand All @@ -39,13 +58,15 @@ services:
DB_PORT: 5432
DB_USER: postgres
IS_UPGRADE: ${IS_UPGRADE}
APIKEY: ${APIKEY}
volumes:
- ./shell/initDB.sh:/home/initDB.sh
- ./sql:/home/sql
entrypoint: ["/bin/bash", "-c"]
- ./app-platform-tmp/sql:/opt/sql
entrypoint: ["/bin/bash", "-c"]
command: |
" chmod +x /home/initDB.sh
bash /home/initDB.sh app_builder /home/sql
"
chmod +x /opt/initDB.sh
sed -i "s#TODO#${APIKEY}#g" /opt/sql/init/data/tr_init_models.sql
bash /opt/initDB.sh app_builder /opt/sql
"
restart: "no"

Expand All @@ -54,8 +75,8 @@ services:
hostname: app-builder
image: ${REPO}/app-builder:${VERSION}
depends_on:
jade-db:
condition: service_healthy
db-initializer:
condition: service_completed_successfully
healthcheck:
test: ["CMD", "curl", "-f", "http://app-builder:8004/fit/check"]
interval: 30s
Expand All @@ -81,8 +102,15 @@ services:
LOG_HOME: /log/app
LOG_NUM: 4320
LOG_SIZE: "50M"
app-engine.ttl.businessData: 15
app-engine.ttl.nonBusinessData: 1
app-engine.ttl.businessData: 360
app-engine.ttl.nonBusinessData: 180
task.expiredDays: 360
model.imageExtractor.model: THUDM/GLM-4.1V-9B-Thinking
model.imageExtractor.url: https://api.siliconflow.cn/v1
model.audioTranscriptions.model: TeleAI/TeleSpeechASR
model.audioTranscriptions.url: https://api.siliconflow.cn/v1
model.imageExtractor.apiKey: ${APIKEY}
model.audioTranscriptions.apiKey: ${APIKEY}
volumes:
- "./app-platform-tmp/fit-runtime:/var/store/tools"
- "./app-platform-tmp/log:/log/app/app-builder"
Expand All @@ -97,7 +125,7 @@ services:
image: ${REPO}/fit-runtime-java:${VERSION}
depends_on:
app-builder:
condition: service_healthy
condition: service_healthy
networks:
my-net:
ipv4_address: 172.0.0.101
Expand All @@ -116,14 +144,14 @@ services:
- "./app-platform-tmp/log:/log/app/runtime-java"
ports:
- "8090:8090"

fit-runtime-python:
container_name: fit-runtime-python
hostname: fit-runtime-python
image: ${REPO}/fit-runtime-python:${VERSION}
depends_on:
app-builder:
condition: service_healthy
condition: service_healthy
networks:
my-net:
ipv4_address: 172.0.0.102
Expand All @@ -142,7 +170,7 @@ services:
- "./app-platform-tmp/log:/log/app/runtime-python"
ports:
- "9666:9666"

web:
container_name: web
hostname: web
Expand Down
20 changes: 0 additions & 20 deletions docker/import_model.sh

This file was deleted.

77 changes: 0 additions & 77 deletions docker/shell/initDB.sh

This file was deleted.

Loading