diff --git a/build/local/docker-compose-local.yml b/build/local/docker-compose-local.yml index 6ff1dab79c..5439040172 100644 --- a/build/local/docker-compose-local.yml +++ b/build/local/docker-compose-local.yml @@ -1,8 +1,8 @@ -version: "3.8" +version: '3.8' services: db: - profiles: ["database"] + profiles: ['database'] restart: always networks: - zitadel @@ -11,9 +11,29 @@ services: ports: - 8080:8080 - 26257:26257 - + + minio: + profiles: ['backend'] + image: minio/minio:RELEASE.2021-06-14T01-29-23Z + restart: on-failure + networks: + - zitadel + environment: + - MINIO_ACCESS_KEY=access_key + - MINIO_SECRET_KEY=secret_key + healthcheck: + test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live'] + interval: 30s + timeout: 5s + retries: 3 + start_period: 5s + command: + - gateway + - nas + - /export + db-migrations: - profiles: ["database"] + profiles: ['database'] restart: on-failure networks: - zitadel @@ -31,9 +51,9 @@ services: - FLYWAY_PLACEHOLDERS_authzpassword=NULL - FLYWAY_PLACEHOLDERS_queriespassword=NULL command: -url=jdbc:postgresql://db:26257/defaultdb -user=root -password= -connectRetries=5 migrate - + keys: - profiles: ["init-backend"] + profiles: ['init-backend'] restart: on-failure networks: - zitadel @@ -47,7 +67,7 @@ services: - ./local.env backend-setup: - profiles: ["init-backend"] + profiles: ['init-backend'] restart: on-failure networks: - zitadel @@ -63,17 +83,24 @@ services: - ../../.keys:/go/src/github.com/caos/zitadel/.keys env_file: - ./local.env - environment: + environment: - ZITADEL_EVENTSTORE_HOST=db - command: [ "-setup-files=cmd/zitadel/setup.yaml", "-setup-files=cmd/zitadel/system-defaults.yaml", "-setup-files=cmd/zitadel/authz.yaml", "setup" ] - + command: + [ + '-setup-files=cmd/zitadel/setup.yaml', + '-setup-files=cmd/zitadel/system-defaults.yaml', + '-setup-files=cmd/zitadel/authz.yaml', + 'setup', + ] + backend-run: - profiles: ["backend"] + profiles: ['backend'] restart: on-failure networks: - zitadel depends_on: - db + - minio build: context: ../.. dockerfile: build/dockerfile @@ -84,15 +111,23 @@ services: - ../../.keys:/go/src/github.com/caos/zitadel/.keys env_file: - ./local.env - environment: + environment: - ZITADEL_EVENTSTORE_HOST=db ports: - 50002:50002 - 50003:50003 - command: [ "-console=false", "-localDevMode=true", "-config-files=cmd/zitadel/startup.yaml", "-config-files=cmd/zitadel/system-defaults.yaml", "-config-files=cmd/zitadel/authz.yaml", "start" ] + command: + [ + '-console=false', + '-localDevMode=true', + '-config-files=cmd/zitadel/startup.yaml', + '-config-files=cmd/zitadel/system-defaults.yaml', + '-config-files=cmd/zitadel/authz.yaml', + 'start', + ] zitadel-setted-up: - profiles: ["setup"] + profiles: ['setup'] networks: - zitadel build: @@ -105,7 +140,7 @@ services: - FE_PORT=4200 grpc-web-gateway: - profiles: ["frontend"] + profiles: ['frontend'] restart: on-failure logging: driver: none @@ -116,13 +151,13 @@ services: dockerfile: build/local/Dockerfile.gateway image: grpcweb/grpcwebproxy ports: - - "50000:8080" + - '50000:8080' environment: - BKD_HOST=backend-run - BKD_PORT=50001 - + frontend-local-run: - profiles: ["frontend"] + profiles: ['frontend'] networks: - zitadel depends_on: @@ -140,7 +175,7 @@ services: - 4200:4200 client-id: - profiles: ["init-frontend"] + profiles: ['init-frontend'] networks: - zitadel build: @@ -154,4 +189,4 @@ services: - PORT=50002 networks: - zitadel: {} \ No newline at end of file + zitadel: {} diff --git a/build/local/local.env b/build/local/local.env index 6507134ed9..3b64a682d7 100644 --- a/build/local/local.env +++ b/build/local/local.env @@ -59,3 +59,10 @@ ZITADEL_CONSOLE_GRANT_TYPE=AUTHORIZATION_CODE ZITADEL_CONSOLE_DEV_MODE=true ZITADEL_CONSOLE_ENV_DIR=console/src/assets/ + +#minio configuration +ZITADEL_ASSET_STORAGE_ACCESS_KEY_ID=access_key +ZITADEL_ASSET_STORAGE_SECRET_ACCESS_KEY=secret_key +ZITADEL_ASSET_STORAGE_TYPE=s3 +ZITADEL_ASSET_STORAGE_ENDPOINT=minio:9000 +ZITADEL_ASSET_STORAGE_BUCKET_PREFIX=local