diff --git a/apps/clickhouse-25.4.yml b/apps/clickhouse-25.4.yml index ad0b0e4..901b37b 100644 --- a/apps/clickhouse-25.4.yml +++ b/apps/clickhouse-25.4.yml @@ -1,9 +1,11 @@ +# connect as user default, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 8123 (HTTP; native protocol is 9000) services: clickhouse: image: clickhouse/clickhouse-server:25.4 restart: unless-stopped environment: CLICKHOUSE_DB: ${APP_NAME} + CLICKHOUSE_PASSWORD: ${DATABASE_PASSWORD} volumes: - ${DATA_DIR}/clickhouse/data:/var/lib/clickhouse - ${DATA_DIR}/clickhouse/logs:/var/log/clickhouse-server diff --git a/apps/clickhouse-26.5.yml b/apps/clickhouse-26.5.yml index 5da0d74..868754f 100644 --- a/apps/clickhouse-26.5.yml +++ b/apps/clickhouse-26.5.yml @@ -1,12 +1,11 @@ +# connect as user default, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 8123 (HTTP; native protocol is 9000) services: clickhouse: image: clickhouse/clickhouse-server:26.5 restart: unless-stopped environment: CLICKHOUSE_DB: ${APP_NAME} - CLICKHOUSE_USER: ${APP_NAME} CLICKHOUSE_PASSWORD: ${DATABASE_PASSWORD} - CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1 volumes: - ${DATA_DIR}/clickhouse/data:/var/lib/clickhouse - ${DATA_DIR}/clickhouse/logs:/var/log/clickhouse-server diff --git a/apps/codecov/codecov.yml.tpl b/apps/codecov/codecov.yml.tpl index 92de082..74c76ab 100644 --- a/apps/codecov/codecov.yml.tpl +++ b/apps/codecov/codecov.yml.tpl @@ -24,9 +24,9 @@ github: id: ${GITHUB_APP_ID} pem: /config/key.pem services: - redis_url: "redis://redis:6379" - database_url: "postgres://${APP_NAME}:${DATABASE_PASSWORD}@postgres:5432/${APP_NAME}" - timeseries_database_url: "postgres://${APP_NAME}:${DATABASE_PASSWORD}@timescale:5432/${APP_NAME}" + redis_url: "redis://:${DATABASE_PASSWORD}@redis:6379" + database_url: "postgres://postgres:${DATABASE_PASSWORD}@postgres:5432/${APP_NAME}" + timeseries_database_url: "postgres://postgres:${DATABASE_PASSWORD}@timescale:5432/${APP_NAME}" minio: host: ${S3_HOST} bucket: ${S3_BUCKET} diff --git a/apps/gatus/docker-compose.yml b/apps/gatus/docker-compose.yml index 6b7ca1e..720e222 100644 --- a/apps/gatus/docker-compose.yml +++ b/apps/gatus/docker-compose.yml @@ -8,7 +8,7 @@ x-vault-env: &vault-env TELEGRAM_ID: ${TELEGRAM_CHAT} x-internal-env: &internal-env GATUS_CONFIG_PATH: /config/yml - POSTGRES_USER: ${APP_NAME} + POSTGRES_USER: postgres POSTGRES_DB: ${APP_NAME} services: gatus: diff --git a/apps/glitchtip/docker-compose.yml b/apps/glitchtip/docker-compose.yml index d3c3ec7..9d63618 100644 --- a/apps/glitchtip/docker-compose.yml +++ b/apps/glitchtip/docker-compose.yml @@ -4,7 +4,7 @@ include: - ../redis-8.yml x-image: &image glitchtip/glitchtip x-vault-env: &vault-env - DATABASE_URL: postgresql://${APP_NAME}:${DATABASE_PASSWORD}@postgres:5432/${APP_NAME} + DATABASE_URL: postgresql://postgres:${DATABASE_PASSWORD}@postgres:5432/${APP_NAME} SECRET_KEY: ${SESSION_KEY} EMAIL_URL: ${EMAIL_URL:-consolemail://} GLITCHTIP_DOMAIN: https://${APP_NAME}.${DOMAIN} diff --git a/apps/mongodb-8.yml b/apps/mongodb-8.yml index 1dc1816..2b773a7 100644 --- a/apps/mongodb-8.yml +++ b/apps/mongodb-8.yml @@ -1,11 +1,10 @@ +# connect as user root, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 27017 services: mongodb: image: bitnami/mongodb restart: unless-stopped environment: MONGODB_ROOT_PASSWORD: ${DATABASE_PASSWORD} - MONGODB_USERNAME: ${APP_NAME} - MONGODB_PASSWORD: ${DATABASE_PASSWORD} MONGODB_DATABASE: ${APP_NAME} volumes: - ${DATA_DIR}/mongodb:/bitnami/mongodb diff --git a/apps/mysql-8.yml b/apps/mysql-8.yml index e1e13ce..321eede 100644 --- a/apps/mysql-8.yml +++ b/apps/mysql-8.yml @@ -1,11 +1,10 @@ +# connect as user root, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 3306 services: mysql: image: mysql:8 restart: unless-stopped environment: MYSQL_DATABASE: ${APP_NAME} - MYSQL_USER: ${APP_NAME} - MYSQL_PASSWORD: ${DATABASE_PASSWORD} MYSQL_ROOT_PASSWORD: ${DATABASE_PASSWORD} volumes: - ${DATA_DIR}/mysql:/var/lib/mysql diff --git a/apps/paradedb-17.yml b/apps/paradedb-17.yml index 1cf351c..a6ce0f1 100644 --- a/apps/paradedb-17.yml +++ b/apps/paradedb-17.yml @@ -1,3 +1,4 @@ +# connect as user postgres, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 5432 services: paradedb: image: paradedb/paradedb:latest-pg17 @@ -6,11 +7,10 @@ services: environment: POSTGRES_DB: ${APP_NAME} POSTGRES_PASSWORD: ${DATABASE_PASSWORD} - POSTGRES_USER: ${APP_NAME} volumes: - ${DATA_DIR}/paradedb:/var/lib/postgresql/data healthcheck: - test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "${APP_NAME}"] + test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "postgres"] start_period: 30s interval: 30s timeout: 5s diff --git a/apps/pgvector-17.yml b/apps/pgvector-17.yml index fd486d3..0c3dce1 100644 --- a/apps/pgvector-17.yml +++ b/apps/pgvector-17.yml @@ -1,3 +1,4 @@ +# connect as user postgres, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 5432 services: pgvector: image: pgvector/pgvector:pg17 @@ -6,11 +7,10 @@ services: environment: POSTGRES_DB: ${APP_NAME} POSTGRES_PASSWORD: ${DATABASE_PASSWORD} - POSTGRES_USER: ${APP_NAME} volumes: - ${DATA_DIR}/pgvector:/var/lib/postgresql/data healthcheck: - test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "${APP_NAME}"] + test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "postgres"] start_period: 30s interval: 30s timeout: 5s diff --git a/apps/postgres-17.yml b/apps/postgres-17.yml index e54305d..72714b7 100644 --- a/apps/postgres-17.yml +++ b/apps/postgres-17.yml @@ -1,3 +1,4 @@ +# connect as user postgres, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 5432 services: postgres: image: postgres:17 @@ -6,11 +7,10 @@ services: environment: POSTGRES_DB: ${APP_NAME} POSTGRES_PASSWORD: ${DATABASE_PASSWORD} - POSTGRES_USER: ${APP_NAME} volumes: - ${DATA_DIR}/postgres:/var/lib/postgresql/data healthcheck: - test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "${APP_NAME}"] + test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "postgres"] start_period: 30s interval: 30s timeout: 5s diff --git a/apps/postgres-18.yml b/apps/postgres-18.yml index 9170443..1d27ce8 100644 --- a/apps/postgres-18.yml +++ b/apps/postgres-18.yml @@ -1,3 +1,4 @@ +# connect as user postgres, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 5432 services: postgres: image: postgres:18 @@ -6,11 +7,10 @@ services: environment: POSTGRES_DB: ${APP_NAME} POSTGRES_PASSWORD: ${DATABASE_PASSWORD} - POSTGRES_USER: ${APP_NAME} volumes: - ${DATA_DIR}/postgres:/var/lib/postgresql healthcheck: - test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "${APP_NAME}"] + test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "postgres"] start_period: 30s interval: 30s timeout: 5s diff --git a/apps/redis-7.yml b/apps/redis-7.yml index 3be1602..32fc133 100644 --- a/apps/redis-7.yml +++ b/apps/redis-7.yml @@ -1,11 +1,13 @@ +# connect as user default, password ${DATABASE_PASSWORD}, port 6379 services: redis: image: redis:7 + command: ["redis-server", "--requirepass", "${DATABASE_PASSWORD}"] restart: unless-stopped volumes: - ${DATA_DIR}/redis:/data healthcheck: - test: ["CMD", "redis-cli", "ping"] + test: ["CMD", "redis-cli", "-a", "${DATABASE_PASSWORD}", "--no-auth-warning", "ping"] start_period: 30s interval: 30s timeout: 5s diff --git a/apps/redis-8.yml b/apps/redis-8.yml index 4c14743..3c5457a 100644 --- a/apps/redis-8.yml +++ b/apps/redis-8.yml @@ -1,11 +1,13 @@ +# connect as user default, password ${DATABASE_PASSWORD}, port 6379 services: redis: image: redis:8 + command: ["redis-server", "--requirepass", "${DATABASE_PASSWORD}"] restart: unless-stopped volumes: - ${DATA_DIR}/redis:/data healthcheck: - test: ["CMD", "redis-cli", "ping"] + test: ["CMD", "redis-cli", "-a", "${DATABASE_PASSWORD}", "--no-auth-warning", "ping"] start_period: 30s interval: 30s timeout: 5s diff --git a/apps/rybbit/docker-compose.yml b/apps/rybbit/docker-compose.yml index 05d51d4..b3fcb80 100644 --- a/apps/rybbit/docker-compose.yml +++ b/apps/rybbit/docker-compose.yml @@ -2,6 +2,7 @@ include: - ../networks.yml - ../postgres-18.yml - ../clickhouse-26.5.yml + - ../redis-8.yml x-vault-env: &vault-env BASE_URL: https://${APP_NAME}.${DOMAIN} BETTER_AUTH_SECRET: ${SESSION_KEY} @@ -10,15 +11,17 @@ x-vault-env: &vault-env MAPBOX_TOKEN: ${MAPBOX_TOKEN:-} POSTGRES_PASSWORD: ${DATABASE_PASSWORD} CLICKHOUSE_PASSWORD: ${DATABASE_PASSWORD} + REDIS_PASSWORD: ${DATABASE_PASSWORD} x-internal-env: &internal-env NODE_ENV: production POSTGRES_HOST: postgres POSTGRES_PORT: 5432 POSTGRES_DB: ${APP_NAME} - POSTGRES_USER: ${APP_NAME} + POSTGRES_USER: postgres CLICKHOUSE_HOST: http://clickhouse:8123 CLICKHOUSE_DB: ${APP_NAME} - CLICKHOUSE_USER: ${APP_NAME} + REDIS_HOST: redis + REDIS_PORT: 6379 services: client: image: ghcr.io/rybbit-io/rybbit-client @@ -51,6 +54,8 @@ services: condition: service_healthy postgres: condition: service_healthy + redis: + condition: service_healthy healthcheck: test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://127.0.0.1:3001/api/health"] start_period: 30s diff --git a/apps/semaphore/docker-compose.yml b/apps/semaphore/docker-compose.yml index de0e682..be4038a 100644 --- a/apps/semaphore/docker-compose.yml +++ b/apps/semaphore/docker-compose.yml @@ -12,7 +12,7 @@ x-internal-env: &internal-env SEMAPHORE_DB_DIALECT: postgres SEMAPHORE_DB_HOST: postgres SEMAPHORE_DB_NAME: ${APP_NAME} - SEMAPHORE_DB_USER: ${APP_NAME} + SEMAPHORE_DB_USER: postgres SEMAPHORE_ADMIN: admin SEMAPHORE_ADMIN_NAME: admin SEMAPHORE_TELEGRAM_ALERT: true diff --git a/apps/timescale-17.yml b/apps/timescale-17.yml index 0c20e5f..97c10e6 100644 --- a/apps/timescale-17.yml +++ b/apps/timescale-17.yml @@ -1,15 +1,15 @@ +# connect as user postgres, password ${DATABASE_PASSWORD}, database ${APP_NAME}, port 5432 services: timescale: image: timescale/timescaledb:latest-pg17 restart: unless-stopped environment: POSTGRES_DB: ${APP_NAME} - POSTGRES_USER: ${APP_NAME} POSTGRES_PASSWORD: ${DATABASE_PASSWORD} volumes: - ${DATA_DIR}/timescale:/var/lib/postgresql/data healthcheck: - test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "${APP_NAME}"] + test: ["CMD", "pg_isready", "-d", "${APP_NAME}", "-U", "postgres"] start_period: 30s interval: 30s timeout: 5s