cameleer/cameleer-saas
2
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Docker Compose database initialization
Some checks failed
CI / build (push) Successful in 38s
Details
CI / docker (push) Has been cancelled
Details

Browse Source 
- init-databases.sh: create cameleer3 DB for cameleer3-server, connect
  to $POSTGRES_DB explicitly (avoids 'database cameleer does not exist')
- clickhouse-init.sql: auto-create cameleer database on first start
- docker-compose.yml: fix cameleer3-server datasource to cameleer3 DB,
  add ClickHouse init script volume mount, pass credentials

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-04 23:37:19 +02:00
parent 567d92ca34
commit d0fd2c49be
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker-compose.yml
View File

@@ -94,7 +94,9 @@ services:
clickhouse: clickhouse:
condition: service_started condition: service_started
environment: environment:
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB:-cameleer_saas} SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/cameleer3
SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER:-cameleer}
SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD:-cameleer_dev}
CLICKHOUSE_URL: jdbc:clickhouse://clickhouse:8123/cameleer CLICKHOUSE_URL: jdbc:clickhouse://clickhouse:8123/cameleer
CAMELEER_AUTH_TOKEN: ${CAMELEER_AUTH_TOKEN:-default-bootstrap-token} CAMELEER_AUTH_TOKEN: ${CAMELEER_AUTH_TOKEN:-default-bootstrap-token}
CAMELEER_TENANT_ID: ${CAMELEER_TENANT_SLUG:-default} CAMELEER_TENANT_ID: ${CAMELEER_TENANT_SLUG:-default}
@@ -117,6 +119,7 @@ services:
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- chdata:/var/lib/clickhouse - chdata:/var/lib/clickhouse
- ./docker/clickhouse-init.sql:/docker-entrypoint-initdb.d/init.sql:ro
healthcheck: healthcheck:
test: ["CMD-SHELL", "clickhouse-client --query 'SELECT 1'"] test: ["CMD-SHELL", "clickhouse-client --query 'SELECT 1'"]
interval: 10s interval: 10s

1
docker/clickhouse-init.sql Normal file
View File

@@ -0,0 +1 @@
CREATE DATABASE IF NOT EXISTS cameleer;

4
docker/init-databases.sh
View File

@@ -1,7 +1,9 @@
#!/bin/bash #!/bin/bash
set -e set -e
psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" <<-EOSQL psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
CREATE DATABASE logto; CREATE DATABASE logto;
CREATE DATABASE cameleer3;
GRANT ALL PRIVILEGES ON DATABASE logto TO $POSTGRES_USER; GRANT ALL PRIVILEGES ON DATABASE logto TO $POSTGRES_USER;
GRANT ALL PRIVILEGES ON DATABASE cameleer3 TO $POSTGRES_USER;
EOSQL EOSQL