Merge branch 'next' into patch-1
This commit is contained in:
@@ -9,7 +9,7 @@ services:
|
||||
image: docker.io/library/postgres:12-alpine
|
||||
restart: unless-stopped
|
||||
healthcheck:
|
||||
test: ["CMD-SHELL", "pg_isready -d authentik -U $${SERVICE_USER_POSTGRESQL}"]
|
||||
test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"]
|
||||
interval: 2s
|
||||
timeout: 10s
|
||||
retries: 15
|
||||
@@ -55,8 +55,10 @@ services:
|
||||
- ./media:/media
|
||||
- ./custom-templates:/templates
|
||||
depends_on:
|
||||
- postgresql
|
||||
- redis
|
||||
postgresql:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
authentik-worker:
|
||||
image: ghcr.io/goauthentik/server:${AUTHENTIK_TAG:-2024.2.2}
|
||||
restart: unless-stopped
|
||||
@@ -90,5 +92,7 @@ services:
|
||||
- ./certs:/certs
|
||||
- ./custom-templates:/templates
|
||||
depends_on:
|
||||
- postgresql
|
||||
- redis
|
||||
postgresql:
|
||||
condition: service_healthy
|
||||
redis:
|
||||
condition: service_healthy
|
||||
|
||||
@@ -16,7 +16,7 @@ services:
|
||||
- GITEA__database__USER=$SERVICE_USER_MYSQL
|
||||
- GITEA__database__PASSWD=$SERVICE_PASSWORD_MYSQL
|
||||
volumes:
|
||||
- gitea-data:/var/lib/gitea
|
||||
- gitea-data:/data
|
||||
- gitea-timezone:/etc/timezone:ro
|
||||
- gitea-localtime:/etc/localtime:ro
|
||||
ports:
|
||||
|
||||
@@ -16,7 +16,7 @@ services:
|
||||
- GITEA__database__USER=$SERVICE_USER_MYSQL
|
||||
- GITEA__database__PASSWD=$SERVICE_PASSWORD_MYSQL
|
||||
volumes:
|
||||
- gitea-data:/var/lib/gitea
|
||||
- gitea-data:/data
|
||||
- gitea-timezone:/etc/timezone:ro
|
||||
- gitea-localtime:/etc/localtime:ro
|
||||
ports:
|
||||
|
||||
@@ -16,7 +16,7 @@ services:
|
||||
- GITEA__database__USER=$SERVICE_USER_POSTGRESQL
|
||||
- GITEA__database__PASSWD=$SERVICE_PASSWORD_POSTGRESQL
|
||||
volumes:
|
||||
- gitea-data:/var/lib/gitea
|
||||
- gitea-data:/data
|
||||
- gitea-timezone:/etc/timezone:ro
|
||||
- gitea-localtime:/etc/localtime:ro
|
||||
ports:
|
||||
|
||||
31
templates/compose/glances.yaml
Normal file
31
templates/compose/glances.yaml
Normal file
@@ -0,0 +1,31 @@
|
||||
# documentation: https://nicolargo.github.io/glances/
|
||||
# slogan: An Eye on your system
|
||||
# tags: monitoring tool python cross platform
|
||||
# logo: svgs/glances.png
|
||||
# port: 61208
|
||||
|
||||
services:
|
||||
glances:
|
||||
image: nicolargo/glances:latest
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- GLANCES_OPT=-w
|
||||
- SERVICE_FQDN_GLANCES_61208
|
||||
volumes:
|
||||
- /var/run/docker.sock:/var/run/docker.sock:ro
|
||||
- /run/user/1000/podman/podman.sock:/run/user/1000/podman/podman.sock:ro
|
||||
pid: "host"
|
||||
privileged: true
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost:61208"]
|
||||
interval: 2s
|
||||
timeout: 10s
|
||||
retries: 30
|
||||
# Uncomment for GPU compatibilty (Nvidia) inside the container
|
||||
# deploy:
|
||||
# resources:
|
||||
# reservations:
|
||||
# devices:
|
||||
# - driver: nvidia
|
||||
# count: 1
|
||||
# capabilities: [gpu]
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
services:
|
||||
plausible:
|
||||
image: plausible/analytics:v2.0
|
||||
image: image: ghcr.io/plausible/community-edition:v2.1.1
|
||||
command: sh -c "sleep 10 && /entrypoint.sh db createdb && /entrypoint.sh db migrate && /entrypoint.sh run"
|
||||
environment:
|
||||
- DATABASE_URL=postgres://postgres:$SERVICE_PASSWORD_POSTGRES@plausible_db/plausible
|
||||
@@ -30,7 +30,7 @@ services:
|
||||
- POSTGRES_PASSWORD=$SERVICE_PASSWORD_POSTGRES
|
||||
|
||||
plausible_events_db:
|
||||
image: clickhouse/clickhouse-server:23.3.7.5-alpine
|
||||
image: clickhouse/clickhouse-server:24.3.3.102-alpine
|
||||
volumes:
|
||||
- type: volume
|
||||
source: event-data
|
||||
|
||||
23
templates/compose/statusnook.yaml
Normal file
23
templates/compose/statusnook.yaml
Normal file
@@ -0,0 +1,23 @@
|
||||
# documentation: https://statusnook.com
|
||||
# slogan: Effortlessly deploy a status page and start monitoring endpoints in minutes
|
||||
# tags: go,html,monitoring,sqlite,self,hosted,status,page,htmx,smtp,slack
|
||||
# logo: svgs/statusnook.svg
|
||||
# port: 8000
|
||||
|
||||
services:
|
||||
statusnook:
|
||||
environment:
|
||||
- SERVICE_FQDN_STATUSNOOK_8000
|
||||
volumes:
|
||||
- "statusnook-data:/app/statusnook-data"
|
||||
image: goksan/statusnook
|
||||
healthcheck:
|
||||
test:
|
||||
- CMD
|
||||
- wget
|
||||
- "-q"
|
||||
- "--spider"
|
||||
- "http://127.0.0.1:8000"
|
||||
interval: 2s
|
||||
timeout: 10s
|
||||
retries: 15
|
||||
@@ -617,7 +617,7 @@ services:
|
||||
- LOGFLARE_NODE_HOST=127.0.0.1
|
||||
- DB_USERNAME=supabase_admin
|
||||
- DB_DATABASE=${POSTGRES_DB:-postgres}
|
||||
- DB_HOSTNAME=${POSTGRES_HOST:-supabase-db}
|
||||
- DB_HOSTNAME=${POSTGRES_HOSTNAME:-supabase-db}
|
||||
- DB_PORT=${POSTGRES_PORT:-5432}
|
||||
- DB_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
|
||||
- DB_SCHEMA=_analytics
|
||||
@@ -628,7 +628,7 @@ services:
|
||||
- LOGFLARE_MIN_CLUSTER_SIZE=1
|
||||
|
||||
# Comment variables to use Big Query backend for analytics
|
||||
- POSTGRES_BACKEND_URL=postgresql://supabase_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOST:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- POSTGRES_BACKEND_URL=postgresql://supabase_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- POSTGRES_BACKEND_SCHEMA=_analytics
|
||||
- LOGFLARE_FEATURE_FLAG_OVERRIDE=multibackend=true
|
||||
|
||||
@@ -904,7 +904,7 @@ services:
|
||||
condition: service_healthy
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
- PGRST_DB_URI=postgres://authenticator:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOST:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- PGRST_DB_URI=postgres://authenticator:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- PGRST_DB_SCHEMAS=${PGRST_DB_SCHEMAS:-public}
|
||||
- PGRST_DB_ANON_ROLE=anon
|
||||
- PGRST_JWT_SECRET=${SERVICE_PASSWORD_JWT}
|
||||
@@ -940,7 +940,7 @@ services:
|
||||
- API_EXTERNAL_URL=${API_EXTERNAL_URL:-http://supabase-kong:8000}
|
||||
|
||||
- GOTRUE_DB_DRIVER=postgres
|
||||
- GOTRUE_DB_DATABASE_URL=postgres://supabase_auth_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOST:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- GOTRUE_DB_DATABASE_URL=postgres://supabase_auth_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
|
||||
- GOTRUE_SITE_URL=${SERVICE_FQDN_SUPABASEKONG}
|
||||
- GOTRUE_URI_ALLOW_LIST=${ADDITIONAL_REDIRECT_URLS}
|
||||
@@ -1012,7 +1012,7 @@ services:
|
||||
"-o",
|
||||
"/dev/null",
|
||||
"-H",
|
||||
"Authorization: Bearer ${ANON_KEY}",
|
||||
"Authorization: Bearer ${SERVICE_SUPABASEANON_KEY}",
|
||||
"http://127.0.0.1:4000/api/tenants/realtime-dev/health"
|
||||
]
|
||||
timeout: 5s
|
||||
@@ -1020,7 +1020,7 @@ services:
|
||||
retries: 3
|
||||
environment:
|
||||
- PORT=4000
|
||||
- DB_HOST=${POSTGRES_HOST:-supabase-db}
|
||||
- DB_HOST=${POSTGRES_HOSTNAME:-supabase-db}
|
||||
- DB_PORT=${POSTGRES_PORT:-5432}
|
||||
- DB_USER=supabase_admin
|
||||
- DB_PASSWORD=${SERVICE_PASSWORD_POSTGRES}
|
||||
@@ -1098,7 +1098,7 @@ services:
|
||||
- SERVER_REGION=local
|
||||
- MULTI_TENANT=false
|
||||
- AUTH_JWT_SECRET=${SERVICE_PASSWORD_JWT}
|
||||
- DATABASE_URL=postgres://supabase_storage_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOST:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- DATABASE_URL=postgres://supabase_storage_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- DB_INSTALL_ROLES=false
|
||||
- STORAGE_BACKEND=s3
|
||||
- STORAGE_S3_BUCKET=stub
|
||||
@@ -1121,7 +1121,7 @@ services:
|
||||
# - SERVICE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.ewogICJyb2xlIjogInNlcnZpY2Vfcm9sZSIsCiAgImlzcyI6ICJzdXBhYmFzZSIsCiAgImlhdCI6IDE3MDg5ODg0MDAsCiAgImV4cCI6IDE4NjY4NDEyMDAKfQ.GA7yF2BmqTzqGkP_oqDdJAQVt0djjIxGYuhE0zFDJV4
|
||||
# - POSTGREST_URL=http://supabase-rest:3000
|
||||
# - PGRST_JWT_SECRET=${SERVICE_PASSWORD_JWT}
|
||||
# - DATABASE_URL=postgres://supabase_storage_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOST:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
# - DATABASE_URL=postgres://supabase_storage_admin:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
# - FILE_SIZE_LIMIT=52428800
|
||||
# - STORAGE_BACKEND=s3
|
||||
# - STORAGE_S3_BUCKET=stub
|
||||
@@ -1164,7 +1164,7 @@ services:
|
||||
condition: service_healthy
|
||||
environment:
|
||||
- PG_META_PORT=8080
|
||||
- PG_META_DB_HOST=${POSTGRES_HOST:-supabase-db}
|
||||
- PG_META_DB_HOST=${POSTGRES_HOSTNAME:-supabase-db}
|
||||
- PG_META_DB_PORT=${POSTGRES_PORT:-5432}
|
||||
- PG_META_DB_NAME=${POSTGRES_DB:-postgres}
|
||||
- PG_META_DB_USER=supabase_admin
|
||||
@@ -1185,7 +1185,7 @@ services:
|
||||
- SUPABASE_URL=http://supabase-kong:8000
|
||||
- SUPABASE_ANON_KEY=${SERVICE_SUPABASEANON_KEY}
|
||||
- SUPABASE_SERVICE_ROLE_KEY=${SERVICE_SUPABASESERVICE_KEY}
|
||||
- SUPABASE_DB_URL=postgresql://postgres:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOST:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
- SUPABASE_DB_URL=postgresql://postgres:${SERVICE_PASSWORD_POSTGRES}@${POSTGRES_HOSTNAME:-supabase-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-postgres}
|
||||
# TODO: Allow configuring VERIFY_JWT per function. This PR might help: https://github.com/supabase/cli/pull/786
|
||||
- VERIFY_JWT=${FUNCTIONS_VERIFY_JWT:-false}
|
||||
volumes:
|
||||
|
||||
Reference in New Issue
Block a user