docs(installation): fix guides (#3878)

* docs(installation): download traefik config

* docs(installation): remove unnecessary zitadel user certs
This commit is contained in:
Elio Bischof 2022-07-01 10:18:33 +02:00 committed by GitHub
parent f3d9c45174
commit 974d6eb79d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 23 deletions

View File

@ -22,20 +22,10 @@ services:
chown: chown:
image: 'cockroachdb/cockroach:v22.1.0' image: 'cockroachdb/cockroach:v22.1.0'
entrypoint: [ '/bin/bash', '-c' ] entrypoint: [ '/bin/bash', '-c' ]
command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && cp /certs/client.zitadel_user.crt /zitadel-certs/ && cp /certs/client.zitadel_user.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ] command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ]
volumes: volumes:
- 'certs:/certs:ro' - 'certs:/certs:ro'
- 'zitadel-certs:/zitadel-certs:rw' - 'zitadel-certs:/zitadel-certs:rw'
depends_on:
client-certs:
condition: 'service_completed_successfully'
client-certs:
image: 'cockroachdb/cockroach:v22.1.0'
command: 'cert create-client --certs-dir /certs/ --ca-key /certs/ca.key zitadel_user'
restart: 'on-failure'
volumes:
- 'certs:/certs:rw'
depends_on: depends_on:
my-cockroach-db: my-cockroach-db:
condition: 'service_healthy' condition: 'service_healthy'

View File

@ -9,7 +9,7 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes: volumes:
- "./traefik.yaml:/etc/traefik/traefik.yaml" - "./example-traefik.yaml:/etc/traefik/traefik.yaml"
zitadel: zitadel:
restart: 'always' restart: 'always'
@ -30,20 +30,10 @@ services:
chown: chown:
image: 'cockroachdb/cockroach:v22.1.0' image: 'cockroachdb/cockroach:v22.1.0'
entrypoint: [ '/bin/bash', '-c' ] entrypoint: [ '/bin/bash', '-c' ]
command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && cp /certs/client.zitadel_user.crt /zitadel-certs/ && cp /certs/client.zitadel_user.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ] command: [ 'cp /certs/ca.crt /zitadel-certs/ && cp /certs/client.root.crt /zitadel-certs/ && cp /certs/client.root.key /zitadel-certs/ && chown 1000:1000 /zitadel-certs/* && chmod 0400 /zitadel-certs/*' ]
volumes: volumes:
- 'certs:/certs:ro' - 'certs:/certs:ro'
- 'zitadel-certs:/zitadel-certs:rw' - 'zitadel-certs:/zitadel-certs:rw'
depends_on:
client-certs:
condition: 'service_completed_successfully'
client-certs:
image: 'cockroachdb/cockroach:v22.1.0'
command: 'cert create-client --certs-dir /certs/ --ca-key /certs/ca.key zitadel_user'
restart: 'on-failure'
volumes:
- 'certs:/certs:rw'
depends_on: depends_on:
my-cockroach-db: my-cockroach-db:
condition: 'service_healthy' condition: 'service_healthy'

View File

@ -13,6 +13,7 @@ The setup is tested against Docker version 20.10.17 and Docker Compose version v
By executing the commands below, you will download the following files: By executing the commands below, you will download the following files:
- [docker-compose.yaml](./docker-compose.yaml) - [docker-compose.yaml](./docker-compose.yaml)
- [example-traefik.yaml](./example-traefik.yaml)
- [example-zitadel-config.yaml](./example-zitadel-config.yaml) - [example-zitadel-config.yaml](./example-zitadel-config.yaml)
- [example-zitadel-secrets.yaml](./example-zitadel-secrets.yaml) - [example-zitadel-secrets.yaml](./example-zitadel-secrets.yaml)
- [example-zitadel-init-steps.yaml](./example-zitadel-init-steps.yaml) - [example-zitadel-init-steps.yaml](./example-zitadel-init-steps.yaml)
@ -21,6 +22,9 @@ By executing the commands below, you will download the following files:
# Download the docker compose example configuration. For example: # Download the docker compose example configuration. For example:
wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/docker-compose.yaml wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/docker-compose.yaml
# Download the docker compose example configuration. For example:
wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/example-traefik.yaml
# Download and adjust the example configuration file containing standard configuration # Download and adjust the example configuration file containing standard configuration
wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/example-zitadel-config.yaml wget https://raw.githubusercontent.com/zitadel/zitadel/v2-alpha/docs/docs/guides/installation/loadbalancing-example/example-zitadel-config.yaml