fix: one-click services

This commit is contained in:
Andras Bacsai
2024-10-04 20:17:08 +02:00
parent 3b97bb1341
commit 128d732438
4 changed files with 54 additions and 71 deletions

View File

@@ -4,28 +4,26 @@
# logo: svgs/argilla.png
# port: 6900
version: "3"
services:
argilla:
image: "argilla/argilla-server:v2.2.0"
restart: always
environment:
- SERVICE_FQDN_ARGILLA_6900
- ARGILLA_HOME_PATH=/var/lib/argilla
- ARGILLA_ELASTICSEARCH=http://elasticsearch:9200
- ARGILLA_DATABASE_URL=postgresql+asyncpg://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB}
- ARGILLA_REDIS_URL=redis://redis:6379/0
- ARGILLA_AUTH_SECRET_KEY="${SERVICE_PASSWORD_AUTHSECRET}"
- ARGILLA_ENABLE_TELEMETRY=0
- HF_HUB_DISABLE_TELEMETRY=1
- REINDEX_DATASETS=1
- DEFAULT_USER_ENABLED=true
- ARGILLA_AUTH_SECRET_KEY=${SERVICE_PASSWORD_AUTHSECRET}
- ARGILLA_ENABLE_TELEMETRY=${ARGILLA_ENABLE_TELEMETRY:-0}
- HF_HUB_DISABLE_TELEMETRY=${HF_HUB_DISABLE_TELEMETRY:-1}
- REINDEX_DATASETS=${REINDEX_DATASETS:-1}
- DEFAULT_USER_ENABLED=${DEFAULT_USER_ENABLED:-true}
- USERNAME=${ARGILLA_USERNAME:-argilla}
- PASSWORD="${SERVICE_PASSWORD_ARGILLA}"
- API_KEY="${SERVICE_PASSWORD_APIKEY}"
- DEFAULT_USER_PASSWORD="${SERVICE_PASSWORD_ARGILLA}"
- DEFAULT_USER_API_KEY="${SERVICE_PASSWORD_APIKEY}"
- PASSWORD=${SERVICE_PASSWORD_ARGILLA}
- API_KEY=${SERVICE_PASSWORD_APIKEY}
- DEFAULT_USER_PASSWORD=${SERVICE_PASSWORD_ARGILLA}
- DEFAULT_USER_API_KEY=${SERVICE_PASSWORD_APIKEY}
- WORKSPACE=${WORKSPACE:-default}
depends_on:
elasticsearch:
condition: service_healthy
@@ -34,7 +32,7 @@ services:
postgres:
condition: service_healthy
volumes:
- "argilla_data:/var/lib/argilla"
- "argilla-data:/var/lib/argilla"
healthcheck:
test:
- CMD-SHELL
@@ -44,23 +42,23 @@ services:
retries: 5
worker:
image: "argilla/argilla-server:v2.2.0"
restart: always
environment:
- ARGILLA_HOME_PATH=/var/lib/argilla
- ARGILLA_ELASTICSEARCH=http://elasticsearch:9200
- ARGILLA_DATABASE_URL=postgresql+asyncpg://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB}
- ARGILLA_REDIS_URL=redis://redis:6379/0
- ARGILLA_AUTH_SECRET_KEY="${SERVICE_PASSWORD_AUTHSECRET}"
- ARGILLA_ENABLE_TELEMETRY=0
- HF_HUB_DISABLE_TELEMETRY=1
- REINDEX_DATASETS=1
- DEFAULT_USER_ENABLED=true
- ARGILLA_AUTH_SECRET_KEY=${SERVICE_PASSWORD_AUTHSECRET}
- ARGILLA_ENABLE_TELEMETRY=${ARGILLA_ENABLE_TELEMETRY:-0}
- HF_HUB_DISABLE_TELEMETRY=${HF_HUB_DISABLE_TELEMETRY:-1}
- REINDEX_DATASETS=${REINDEX_DATASETS:-1}
- DEFAULT_USER_ENABLED=${DEFAULT_USER_ENABLED:-true}
- USERNAME=${ARGILLA_USERNAME:-argilla}
- PASSWORD="${SERVICE_PASSWORD_ARGILLA}"
- API_KEY="${SERVICE_PASSWORD_APIKEY}"
- DEFAULT_USER_PASSWORD="${SERVICE_PASSWORD_ARGILLA}"
- DEFAULT_USER_API_KEY="${SERVICE_PASSWORD_APIKEY}"
- PASSWORD=${SERVICE_PASSWORD_ARGILLA}
- API_KEY=${SERVICE_PASSWORD_APIKEY}
- DEFAULT_USER_PASSWORD=${SERVICE_PASSWORD_ARGILLA}
- DEFAULT_USER_API_KEY=${SERVICE_PASSWORD_APIKEY}
- BACKGROUND_NUM_WORKERS=${BACKGROUND_NUM_WORKERS:-1}
- WORKSPACE=${WORKSPACE:-default}
depends_on:
elasticsearch:
condition: service_healthy
@@ -69,7 +67,7 @@ services:
postgres:
condition: service_healthy
volumes:
- "argilla_data:/var/lib/argilla"
- "argilla-data:/var/lib/argilla"
command: "sh -c 'python -m argilla_server worker --num-workers $${BACKGROUND_NUM_WORKERS}'"
healthcheck:
test:
@@ -80,13 +78,12 @@ services:
retries: 5
postgres:
image: "postgres:14"
restart: always
environment:
- POSTGRES_USER=${SERVICE_USER_POSTGRES}
- POSTGRES_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
- POSTGRES_DB=${POSTGRES_DB:-argilla}
volumes:
- "pg_data:/var/lib/postgresql/data"
- "pg-data:/var/lib/postgresql/data"
healthcheck:
test:
- CMD-SHELL
@@ -96,9 +93,8 @@ services:
retries: 3
redis:
image: "redis:7"
restart: always
volumes:
- "redis_data:/data"
- "redis-data:/data"
healthcheck:
test:
- CMD-SHELL
@@ -108,20 +104,19 @@ services:
retries: 3
elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.12.2"
restart: always
environment:
- node.name=elasticsearch
- cluster.name=es-argilla-local
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
- cluster.routing.allocation.disk.threshold_enabled=false
- xpack.security.enabled=false
- node.name=${NODE_NAME:-elasticsearch}
- cluster.name=${CLUSTER_NAME:-es-argilla-local}
- discovery.type=${DISCOVERY_TYPE:-single-node}
- "ES_JAVA_OPTS=${ES_JAVA_OPTS:-\"-Xms512m -Xmx512m\"}"
- cluster.routing.allocation.disk.threshold_enabled=${CLUSTER_ROUTING_ALLOCATION_DISK_THRESHOLD_ENABLED:-false}
- xpack.security.enabled=${XPACK_SECURITY_ENABLED:-false}
ulimits:
memlock:
soft: -1
hard: -1
volumes:
- "elasticsearch_data:/usr/share/elasticsearch/data/"
- "elasticsearch-data:/usr/share/elasticsearch/data/"
healthcheck:
test:
- CMD-SHELL
@@ -129,8 +124,3 @@ services:
interval: 10s
timeout: 10s
retries: 5
volumes:
argilla_data: null
elastic_data: null
redis_data: null
pg_data: null