Skip to content

Commit c83d995

Browse files
committed
fix: resolve the conflict
1 parent 4691fc5 commit c83d995

1 file changed

Lines changed: 6 additions & 20 deletions

File tree

deployment/docker/datamate/docker-compose.yml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,14 @@ services:
202202
ports:
203203
- "30001:8000"
204204
depends_on:
205-
- pg-db
205+
- datamate-database
206206
environment:
207207
- DJANGO_DB=default
208-
- POSTGRE_NAME=postgres
208+
- POSTGRE_NAME=labelstudio
209209
- POSTGRE_USER=postgres
210-
- POSTGRE_PASSWORD=
210+
- POSTGRE_PASSWORD=password
211211
- POSTGRE_PORT=5432
212-
- POSTGRE_HOST=db
212+
- POSTGRE_HOST=datamate-database
213213
- LABEL_STUDIO_HOST=${LABEL_STUDIO_HOST:-}
214214
- LOCAL_FILES_SERVING_ENABLED=true
215215
- LOCAL_FILES_DOCUMENT_ROOT=/label-studio/local
@@ -227,20 +227,6 @@ services:
227227
command: label-studio-uwsgi
228228
profiles: [ label-studio ]
229229

230-
pg-db:
231-
container_name: pg-db
232-
image: pgautoupgrade/pgautoupgrade:13-alpine
233-
hostname: db
234-
restart: unless-stopped
235-
environment:
236-
- POSTGRES_HOST_AUTH_METHOD=trust
237-
- POSTGRES_USER=postgres
238-
volumes:
239-
- label-studio-db:/var/lib/postgresql/data
240-
networks:
241-
- datamate
242-
profiles: [ label-studio ]
243-
244230
# ==============================
245231
# Optional: Milvus (profile: milvus)
246232
# ==============================
@@ -276,8 +262,8 @@ services:
276262
- "9001:9001"
277263
- "9000:9000"
278264
volumes:
279-
- minio-volume:/minio_data
280-
command: minio server /minio_data --console-address ":9001"
265+
- minio-volume:/data
266+
command: minio server /data --console-address ":9001"
281267
networks:
282268
- datamate
283269
healthcheck:

0 commit comments

Comments
 (0)