dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: one-click services

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

23
templates/compose/anythingllm.yaml
View File

@@ -10,24 +10,23 @@ services:
environment: environment:
- SERVICE_FQDN_ANYTHINGLLM_3001 - SERVICE_FQDN_ANYTHINGLLM_3001
- STORAGE_DIR=/app/server/storage - STORAGE_DIR=/app/server/storage
- DISABLE_TELEMETRY=true - DISABLE_TELEMETRY=${DISABLE_TELEMETRY:-true}
- PASSWORDLOWERCASE=1 - PASSWORDLOWERCASE=${PASSWORDLOWERCASE:-1}
- PASSWORDMAXCHAR=250 - PASSWORDMAXCHAR=${PASSWORDMAXCHAR:-250}
- PASSWORDMINCHAR=6 - PASSWORDMINCHAR=${PASSWORDMINCHAR:-6}
- PASSWORDNUMERIC=1 - PASSWORDNUMERIC=${PASSWORDNUMERIC:-1}
- PASSWORDREQUIREMENTS=1 - PASSWORDREQUIREMENTS=${PASSWORDREQUIREMENTS:-1}
- PASSWORDSYMBOL=1 - PASSWORDSYMBOL=${PASSWORDSYMBOL:-1}
- PASSWORDUPPERCASE=1 - PASSWORDUPPERCASE=${PASSWORDUPPERCASE:-1}
- SIG_KEY=${SERVICE_PASSWORD_SIGKEY} - SIG_KEY=${SERVICE_PASSWORD_SIGKEY}
- SIG_SALT=${SERVICE_PASSWORD_SIGSALT} - SIG_SALT=${SERVICE_PASSWORD_SIGSALT}
- JWT_SECRET=${SERVICE_PASSWORD_JWTSECRET} - JWT_SECRET=${SERVICE_PASSWORD_JWTSECRET}
- AUTH_TOKEN=${SERVICE_PASSWORD_AUTHTOKEN} - AUTH_TOKEN=${SERVICE_PASSWORD_AUTHTOKEN}
- AUTH_TOKEN=${AUTH_TOKEN}
- SERVER_PORT=${SERVER_PORT:-3001} - SERVER_PORT=${SERVER_PORT:-3001}
cap_add: cap_add:
- SYS_ADMIN - SYS_ADMIN
volumes: volumes:
- "anythingllm_storage:/app/server/storage" - "anythingllm-storage:/app/server/storage"
- "anythingllm_hot:/app/collector/hotdir" - "anythingllm-hot:/app/collector/hotdir"
- "anythingllm_outputs:/app/collector/outputs" - "anythingllm-outputs:/app/collector/outputs"
user: "${UID:-1000}:${GID:-1000}" user: "${UID:-1000}:${GID:-1000}"

72
templates/compose/argilla.yaml
View File

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

28
templates/compose/infisical.yaml
View File

@@ -4,21 +4,14 @@
# logo: svgs/infisical.png # logo: svgs/infisical.png
# port: 8080 # port: 8080
version: "3"
services: services:
backend: backend:
restart: always
depends_on:
redis:
condition: service_healthy
db-migration:
condition: service_completed_successfully
image: "infisical/infisical:latest-postgres" image: "infisical/infisical:latest-postgres"
environment: environment:
- SERVICE_FQDN_BACKEND_8080 - SERVICE_FQDN_BACKEND_8080
- SITE_URL=${SERVICE_FQDN_BACKEND_8080} - SITE_URL=${SERVICE_FQDN_BACKEND_8080}
- NODE_ENV=production - NODE_ENV=${NODE_ENV:-production}
- ENCRYPTION_KEY=${SERVICE_PASSWORD_ENCRYPTIONKEY} - ENCRYPTION_KEY=${SERVICE_PASSWORD_ENCRYPTIONKEY}
- AUTH_SECRET=${SERVICE_REALBASE64_64_AUTHSECRET} - AUTH_SECRET=${SERVICE_REALBASE64_64_AUTHSECRET}
- DB_CONNECTION_URI=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@db:5432/${POSTGRES_DB} - DB_CONNECTION_URI=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@db:5432/${POSTGRES_DB}
@@ -27,11 +20,17 @@ services:
test: test:
- CMD-SHELL - CMD-SHELL
- "wget --no-verbose --tries=1 --spider http://127.0.0.1:8080/api/status || exit 1" - "wget --no-verbose --tries=1 --spider http://127.0.0.1:8080/api/status || exit 1"
depends_on:
redis:
condition: service_healthy
db-migration:
condition: service_completed_successfully
redis: redis:
image: "redis:7" image: "redis:7"
volumes:
- redis-data:/data
environment: environment:
- ALLOW_EMPTY_PASSWORD=yes - ALLOW_EMPTY_PASSWORD=${ALLOW_EMPTY_PASSWORD:-yes}
restart: always
healthcheck: healthcheck:
test: test:
- CMD-SHELL - CMD-SHELL
@@ -39,11 +38,8 @@ services:
interval: 5s interval: 5s
timeout: 5s timeout: 5s
retries: 3 retries: 3
volumes:
- redis_data:/data
db: db:
image: "postgres:14-alpine" image: "postgres:14-alpine"
restart: always
volumes: volumes:
- pg_data:/var/lib/postgresql/data - pg_data:/var/lib/postgresql/data
environment: environment:
@@ -58,10 +54,11 @@ services:
timeout: 10s timeout: 10s
retries: 10 retries: 10
db-migration: db-migration:
exclude_from_hc: true
image: "infisical/infisical:latest-postgres"
depends_on: depends_on:
db: db:
condition: service_healthy condition: service_healthy
image: "infisical/infisical:latest-postgres"
command: "npm run migration:latest" command: "npm run migration:latest"
restart: on-failure restart: on-failure
environment: environment:
@@ -70,6 +67,3 @@ services:
- POSTGRES_DB=${POSTGRES_DB:-infisical} - POSTGRES_DB=${POSTGRES_DB:-infisical}
- DB_CONNECTION_URI=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@db:5432/${POSTGRES_DB:-infisical} - DB_CONNECTION_URI=postgres://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@db:5432/${POSTGRES_DB:-infisical}
- REDIS_URL=redis://redis:6379 - REDIS_URL=redis://redis:6379
volumes:
pg_data:
redis_data:

2
templates/service-templates.json
View File

File diff suppressed because one or more lines are too long