Skip to content

Commit f08e5a5

Browse files
wanghh2000MasonXon
authored andcommitted
feat(docker): update images and configurations
- Updated dataflow image version - Updated label-studio image version - Changed database volume paths - Updated STUDIO_JUMP_URL for API server - Added dataflow_label_studio service - Removed old label-studio service configuration
1 parent d68cc42 commit f08e5a5

File tree

2 files changed

+42
-45
lines changed

2 files changed

+42
-45
lines changed

docker-compose-prd.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ services:
4040

4141
dataflow_celery_worker:
4242
restart: unless-stopped
43-
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:1.12.0
43+
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:20251130
4444
command: >
4545
sh -c "
4646
MILLISECOND_TIMESTAMP=$$(date +%s%3N);
@@ -80,7 +80,7 @@ services:
8080
stdin_open: true
8181
tty: true
8282
build: .
83-
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/label-studio:1.12.0
83+
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/label-studio:20251130
8484
restart: unless-stopped
8585
expose:
8686
- "8002"
@@ -98,7 +98,6 @@ services:
9898
- LABEL_STUDIO_HOST=0.0.0.0
9999
- CSGHUB_ENDPOINT= https://hub.opencsg.com
100100
- LABEL_STUDIO_PORT=8002
101-
# - LOG_LEVEL=DEBUG
102101
volumes:
103102
- /data/v2/label-studio:/label-studio/data:rw
104103
ports:
@@ -109,7 +108,7 @@ services:
109108

110109
dataflow_api_server:
111110
restart: unless-stopped
112-
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:1.12.0
111+
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:20251130
113112
command: >
114113
sh -c "
115114
uvicorn data_server.main:app --host 0.0.0.0 --port 8000
@@ -131,7 +130,7 @@ services:
131130
- DATABASE_PASSWORD=postgres
132131
- DATABASE_HOSTNAME=dataflow_postgres_db
133132
- DATABASE_PORT=5432
134-
- STUDIO_JUMP_URL=http://xxxx:8002
133+
- STUDIO_JUMP_URL=http://8.152.218.254:8002
135134
- REDIS_HOST_URL=redis://dataflow_celery_redis:6379
136135
- MONG_HOST_URL=mongodb://root:example@dataflow_mongo_db:27017
137136
ports:
@@ -146,4 +145,4 @@ services:
146145

147146
networks:
148147
csg-network:
149-
driver: bridge
148+
driver: bridge

docker-compose-stg.yml

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ services:
44
restart: unless-stopped
55
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/postgres:15.10
66
volumes:
7-
- /root/dataflow/dataflow-v2/postgres_db_data:/var/lib/postgresql/data
7+
- /dataflow_data/postgres_db_data:/var/lib/postgresql/data
88
command: -p 5432
99
environment:
1010
- POSTGRES_DB=data_flow
@@ -19,7 +19,7 @@ services:
1919
restart: unless-stopped
2020
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/mongo:8.0.12
2121
volumes:
22-
- /root/dataflow/dataflow-v2/mongodata:/data/db
22+
- /dataflow_data/mongodata:/data/db
2323
environment:
2424
- MONGO_INITDB_ROOT_USERNAME=root
2525
- MONGO_INITDB_ROOT_PASSWORD=example
@@ -32,23 +32,23 @@ services:
3232
restart: unless-stopped
3333
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/redis:7.2.5
3434
volumes:
35-
- /root/dataflow/dataflow-v2/celery_redis_data:/data
35+
- /dataflow_data/celery_redis_data:/data
3636
ports:
3737
- "16379:6379"
3838
networks:
3939
- csg-network
4040

4141
dataflow_celery_worker:
4242
restart: unless-stopped
43-
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:20250916
43+
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:20251130.1
4444
command: >
4545
sh -c "
4646
MILLISECOND_TIMESTAMP=$$(date +%s%3N);
4747
NODENAME=worker_$$MILLISECOND_TIMESTAMP@$$(hostname -f);
4848
celery -A data_celery.main:celery_app worker --loglevel=info --pool=gevent -n $$NODENAME
4949
"
5050
volumes:
51-
- /root/dataflow/dataflow-v2/apidata:/data/dataflow_data
51+
- /dataflow_data/apidata:/data/dataflow_data
5252
environment:
5353
- DATA_DIR=/data/dataflow_data
5454
- CSGHUB_ENDPOINT=https://hub.opencsg-stg.com
@@ -76,15 +76,44 @@ services:
7676
networks:
7777
- csg-network
7878

79+
dataflow_label_studio:
80+
stdin_open: true
81+
tty: true
82+
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/label-studio:20251128
83+
restart: unless-stopped
84+
expose:
85+
- "8002"
86+
depends_on:
87+
- dataflow_postgres_db
88+
environment:
89+
- DJANGO_DB=default
90+
- POSTGRE_NAME=postgres
91+
- POSTGRE_USER=postgres
92+
- POSTGRE_PASSWORD=postgres
93+
- POSTGRE_PORT=5432
94+
- POSTGRE_HOST=dataflow_postgres_db
95+
- LABEL_STUDIO_HOST=${LABEL_STUDIO_HOST:-}
96+
- JSON_LOG=1
97+
- LABEL_STUDIO_HOST=0.0.0.0
98+
- CSGHUB_ENDPOINT= https://hub.opencsg-stg.com
99+
- LABEL_STUDIO_PORT=8002
100+
volumes:
101+
- /dataflow_data/label-studio:/label-studio/data:rw
102+
ports:
103+
- "8002:8002"
104+
command: label-studio
105+
networks:
106+
- csg-network
107+
79108
dataflow_api_server:
80109
restart: unless-stopped
81-
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:20250916
110+
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/dataflow:20251130.1
82111
command: >
83112
sh -c "
84113
uvicorn data_server.main:app --host 0.0.0.0 --port 8000
85114
"
86115
volumes:
87-
- /root/dataflow/dataflow-v2/apidata:/data/dataflow_data
116+
- /dataflow_data/apidata:/data/dataflow_data
88117
environment:
89118
- DATA_DIR=/data/dataflow_data
90119
- CSGHUB_ENDPOINT=https://hub.opencsg-stg.com
@@ -100,7 +129,7 @@ services:
100129
- DATABASE_PASSWORD=postgres
101130
- DATABASE_HOSTNAME=dataflow_postgres_db
102131
- DATABASE_PORT=5432
103-
- STUDIO_JUMP_URL=https://data-label.opencsg.com
132+
- STUDIO_JUMP_URL=http://39.102.214.107:8002
104133
- REDIS_HOST_URL=redis://dataflow_celery_redis:6379
105134
- MONG_HOST_URL=mongodb://root:example@dataflow_mongo_db:27017
106135
ports:
@@ -113,37 +142,6 @@ services:
113142
networks:
114143
- csg-network
115144

116-
dataflow_label_studio:
117-
stdin_open: true
118-
tty: true
119-
build: .
120-
image: opencsg-registry.cn-beijing.cr.aliyuncs.com/opencsghq/label-studio:latest
121-
restart: unless-stopped
122-
expose:
123-
- "8002"
124-
depends_on:
125-
- dataflow_postgres_db
126-
environment:
127-
- DJANGO_DB=default
128-
- POSTGRE_NAME=postgres
129-
- POSTGRE_USER=postgres
130-
- POSTGRE_PASSWORD=postgres
131-
- POSTGRE_PORT=5432
132-
- POSTGRE_HOST=dataflow_postgres_db
133-
- LABEL_STUDIO_HOST=${LABEL_STUDIO_HOST:-}
134-
- JSON_LOG=1
135-
- LABEL_STUDIO_HOST=0.0.0.0
136-
- CSG_HUB_ENDPOINT= https://hub.opencsg-stg.com
137-
- LABEL_STUDIO_PORT=8002
138-
# - LOG_LEVEL=DEBUG
139-
volumes:
140-
- /root/dataflow/dataflow-v2/label-studio:/label-studio/data:rw
141-
ports:
142-
- "8002:8002"
143-
command: label-studio
144-
networks:
145-
- csg-network
146145
networks:
147146
csg-network:
148147
driver: bridge
149-

0 commit comments

Comments
 (0)