TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 06:57:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: improve docker-compose.yml (#3649)

Browse Source 
* chore: improve docker-compose.yml

* simpler compose

* pass local config as variables

* remove default value

* localhost customdomain

* update image

* v2-alpha.3
This commit is contained in:
Elio Bischof
2022-05-18 15:04:47 +02:00
committed by GitHub
parent c8300b61b1
commit ed0aa7088b
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deploy/compose/docker-compose.yaml → deploy/compose/docker-compose.yml
View File

@@ -5,15 +5,13 @@ services:
restart: always restart: always
networks: networks:
- zitadel - zitadel
image: ghcr.io/zitadel/zitadel:v1.80.0-v2.20-amd64 image: ghcr.io/zitadel/zitadel:v2.0.0-v2-alpha.3-amd64
command: admin start-from-init --masterkeyFromEnv command: admin start-from-init --masterkeyFromEnv
environment: environment:
- ZITADEL_MASTERKEY=${ZITADEL_MASTERKEY} - ZITADEL_MASTERKEY=${ZITADEL_MASTERKEY}
- ZITADEL_DATABASE_HOST=db - ZITADEL_DATABASE_HOST=db
- ZITADEL_EXTERNALSECURE=false - ZITADEL_EXTERNALSECURE=false
# TODO: Use the following variables as defaults - ZITADEL_DEFAULTINSTANCE_CUSTOMDOMAIN=localhost
- ZITADEL_EXTERNALDOMAIN=localhost
- ZITADEL_S3DEFAULTINSTANCE_CUSTOMDOMAIN=localhost
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/debug"] test: ["CMD", "curl", "-f", "http://localhost:8080/debug"]
interval: 10s interval: 10s
@@ -30,7 +28,7 @@ services:
restart: always restart: always
networks: networks:
- zitadel - zitadel
image: cockroachdb/cockroach:v21.2.8 image: cockroachdb/cockroach:v21.2.5
command: start-single-node --insecure --listen-addr=0.0.0.0 command: start-single-node --insecure --listen-addr=0.0.0.0
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/health?ready=1"] test: ["CMD", "curl", "-f", "http://localhost:8080/health?ready=1"]

2
docs/docs/guides/installation/linux.mdx
View File

@@ -17,7 +17,7 @@ export ZITADEL_EXTERNALDOMAIN=localhost
export ZITADEL_DEFAULTINSTANCE_CUSTOMDOMAIN=localhost export ZITADEL_DEFAULTINSTANCE_CUSTOMDOMAIN=localhost
# Download the zitadel binary # Download the zitadel binary
curl -s https://api.github.com/repos/zitadel/zitadel/releases/tags/v2.0.0-v2-alpha.1 | grep "browser_download_url.*zitadel_.*_linux_$(dpkg --print-architecture)" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadel && sudo chmod +x /usr/local/bin/zitadel && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel curl -s https://api.github.com/repos/zitadel/zitadel/releases/tags/v2.0.0-v2-alpha.3 | grep "browser_download_url.*zitadel_.*_linux_$(dpkg --print-architecture)" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadel && sudo chmod +x /usr/local/bin/zitadel && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel
sudo chmod +x /usr/local/bin/zitadel sudo chmod +x /usr/local/bin/zitadel
sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel

2
docs/docs/guides/installation/macos.mdx
View File

@@ -18,7 +18,7 @@ export ZITADEL_DEFAULTINSTANCE_CUSTOMDOMAIN=localhost
export MY_ARCHITECTURE="arm64" export MY_ARCHITECTURE="arm64"
# Download the zitadel binary # Download the zitadel binary
curl -s https://api.github.com/repos/zitadel/zitadel/releases/tags/v2.0.0-v2-alpha.1 | grep "browser_download_url.*zitadel_.*_darwin_${MY_ARCHITECTURE}" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadel && sudo chmod +x /usr/local/bin/zitadel && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel curl -s https://api.github.com/repos/zitadel/zitadel/releases/tags/v2.0.0-v2-alpha.3 | grep "browser_download_url.*zitadel_.*_darwin_${MY_ARCHITECTURE}" | cut -d '"' -f 4 | sudo wget -i - -O /usr/local/bin/zitadel && sudo chmod +x /usr/local/bin/zitadel && sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel
sudo chmod +x /usr/local/bin/zitadel sudo chmod +x /usr/local/bin/zitadel
sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel sudo chown $(id -u):$(id -g) /usr/local/bin/zitadel