Compare commits

...

21 Commits

Author SHA1 Message Date
Trez.One 7fbd20c85d Changing Swag port for MeshCentral.
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / Check and Create PR (push) Has been cancelled
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / SonarQube Analysis (push) Has been cancelled
Gitea Branch PR, SonarQube Analyze, and Merge Workflow / Dry Run & PR Merge (push) Has been cancelled
2024-12-22 15:54:21 -05:00
Trez.One c4a32a7983 Custom directive for Zitadel. 2024-12-22 12:16:57 -05:00
Trez.One e93a232790 Komodo.skip flag fix hopefully. 2024-12-22 11:57:08 -05:00
Trez.One 1df03ee939 Custom directive for Zitadel. 2024-12-22 11:52:46 -05:00
Trez.One 4a28bf3785 Custom directive for Zitadel. 2024-12-22 11:35:53 -05:00
Trez.One 5f68436d21 Typo fix. 2024-12-22 10:25:20 -05:00
Trez.One cf5e491870 Adding komodo.skip for dockerproxy. 2024-12-22 10:24:12 -05:00
Trez.One cb13f1dfdb Updated gitignore; komodo skip flags for some containers. 2024-12-22 10:24:12 -05:00
Trez.One 9c38cf3ddc Adding komodo.skip label. 2024-12-22 10:08:41 -05:00
Trez.One e4224fa542 Added Komodo skip labels for Komodo services and Swag. 2024-12-22 09:23:09 -05:00
komodo a3a815c020 [Komodo] TheTreZuredOne: Write Compose File: update docker-compose.yml 2024-12-22 03:23:50 +00:00
komodo 08f26896df [Komodo] TheTreZuredOne: Write Compose File: update docker-compose.yml 2024-12-22 02:45:57 +00:00
komodo 6c93dbb9d1 [Komodo] TheTreZuredOne: Write Compose File: update docker-compose.yml 2024-12-22 02:42:51 +00:00
komodo 42e44b8921 [Komodo] TheTreZuredOne: Write Compose File: update docker-compose.yml 2024-12-22 02:17:43 +00:00
komodo 56688cd1f1 [Komodo] TheTreZuredOne: Write Compose File: update docker-compose.yml 2024-12-22 01:44:47 +00:00
komodo f54666da86 [Komodo] TheTreZuredOne: Write Compose File: update docker-compose.yml 2024-12-22 01:03:47 +00:00
gitea-sonarqube-bot e0ca473a83 Auto Merge
Merged by Trez.One
2024-12-21 19:15:39 -05:00
gitea-sonarqube-bot b6b662f6c0 Auto Merge
Merged by Trez.One
2024-12-21 18:50:10 -05:00
gitea-sonarqube-bot ec01d54b03 Auto Merge
Merged by Trez.One
2024-12-21 15:25:36 -05:00
gitea-sonarqube-bot 8ef3f41712 Auto Merge
Merged by Trez.One
2024-12-21 15:08:35 -05:00
Trez.One 9f75ea89dc Merge pull request 'Re-deploying Zitadel with config files for init.' (#28) from zitadel-deployment into main 2024-12-21 14:57:01 -05:00
2 changed files with 30 additions and 17 deletions
+2 -1
View File
@@ -1 +1,2 @@
**/.env* **/.env*
**/*env*
+28 -16
View File
@@ -877,6 +877,8 @@ services:
- VOLUMES=1 - VOLUMES=1
- LOG_LEVEL=debug - LOG_LEVEL=debug
image: ghcr.io/tecnativa/docker-socket-proxy:latest image: ghcr.io/tecnativa/docker-socket-proxy:latest
labels:
komodo.skip: s
networks: networks:
default: null default: null
ports: ports:
@@ -2672,6 +2674,7 @@ services:
homepage.href: https://komodo.${MY_TLD} homepage.href: https://komodo.${MY_TLD}
homepage.icon: /icons/komodo.png homepage.icon: /icons/komodo.png
homepage.description: Open-source note taking & to-do homepage.description: Open-source note taking & to-do
komodo.skip: a
swag: enable swag: enable
swag_url: komodo.${MY_TLD} swag_url: komodo.${MY_TLD}
swag_port: 9120 swag_port: 9120
@@ -2687,7 +2690,7 @@ services:
- komodo-pg-db - komodo-pg-db
image: ghcr.io/ferretdb/ferretdb image: ghcr.io/ferretdb/ferretdb
labels: labels:
komodo.skip: # Prevent Komodo from stopping with StopAllContainers komodo.skip: a
restart: unless-stopped restart: unless-stopped
expose: expose:
- 27017 - 27017
@@ -2705,7 +2708,7 @@ services:
- 8120 - 8120
image: ghcr.io/mbecker20/periphery:latest image: ghcr.io/mbecker20/periphery:latest
labels: labels:
komodo.skip: komodo.skip: a
restart: always restart: always
volumes: volumes:
- /proc:/proc - /proc:/proc
@@ -2717,6 +2720,8 @@ services:
POSTGRES_DB: komodo POSTGRES_DB: komodo
expose: expose:
- 5432 - 5432
labels:
komodo.skip: a
image: postgres:17-alpine image: postgres:17-alpine
restart: unless-stopped restart: unless-stopped
volumes: volumes:
@@ -3163,7 +3168,7 @@ services:
- homepage.description= - homepage.description=
- swag=enable - swag=enable
- swag_proto=http - swag_proto=http
- swag_port=46717 - swag_port=80
- swag_url=mesh.${MY_TLD} - swag_url=mesh.${MY_TLD}
ports: ports:
- 46717:80 # HTTP - 46717:80 # HTTP
@@ -3235,6 +3240,14 @@ services:
- TZ=${TZ} - TZ=${TZ}
- PUID=${PUID} - PUID=${PUID}
- PGID=${PGID} - PGID=${PGID}
- MALOJA_URL=http://maloja:42010
- MALOJA_API_KEY=${MALOJA_API_KEY}
- LASTFM_API_KEY=${LASTFM_API_KEY}
- LASTFM_API_SECRET=${LASTFM_API_SECRET}
- LZ_USER=Trez.on
- LZ_TOKEN=${MALOJA_LISTENBRAINZ_TOKEN}
- SPOTIFY_CLIENT_ID=${YOUR_SPOTIFY_ID}
- SPOTIFY_CLIENT_SECRET=${YOUR_SPOTIFY_SECRET}
image: foxxmd/multi-scrobbler image: foxxmd/multi-scrobbler
labels: labels:
- homepage.group=Media Library - homepage.group=Media Library
@@ -4616,6 +4629,7 @@ services:
- swag_port=81 - swag_port=81
- swag_url=swag.${MY_TLD} - swag_url=swag.${MY_TLD}
- swag_auth=authelia - swag_auth=authelia
- komodo.skip=a
- swag.uptime-kuma.enabled=true - swag.uptime-kuma.enabled=true
- swag.uptime-kuma.monitor.url=https://swag.${MY_TLD} - swag.uptime-kuma.monitor.url=https://swag.${MY_TLD}
- homepage.group=Infrastructure/App Performance Monitoring - homepage.group=Infrastructure/App Performance Monitoring
@@ -6965,27 +6979,25 @@ services:
zitadel: zitadel:
container_name: zitadel container_name: zitadel
image: ghcr.io/zitadel/zitadel:latest image: ghcr.io/zitadel/zitadel:latest
command: 'start-from-init --masterkeyFromEnv --config /config.yaml --config secrets.yaml --config init-steps.yaml --tlsMode external' command: 'start-from-init --masterkeyFromEnv --config /config.yaml --config /secrets.yaml --config /init-steps.yaml --tlsMode external'
# depends_on: # depends_on:
# zitadel-pg-db: # zitadel-pg-db:
# condition: 'service_healthy' # condition: 'service_healthy'
environment: environment:
ZITADEL_DATABASE_POSTGRES_DATABASE: zitadel
ZITADEL_DATABASE_POSTGRES_USER_PASSWORD: ${ZITADEL_DB_PASSWORD}
ZITADEL_DATABASE_POSTGRES_ADMIN_PASSWORD: ${ZITADEL_DB_ADMIN_PASSWORD}
ZITADEL_MASTERKEY: ${ZITADEL_MASTER_KEY} ZITADEL_MASTERKEY: ${ZITADEL_MASTER_KEY}
expose: expose:
- 8080 - 8080
labels: labels:
- swag=enable swag: enable
- swag_proto=http swag_proto: http
- swag_port=8080 swag_port: 8080
- swag_url=zitadel.${MY_TLD} swag_url: id.${MY_TLD}
- homepage.group=System Administration swag_server_custom_directive: http2 on;
- homepage.name=Zitadel homepage.group: System Administration
- homepage.href=https://id.${MY_TLD} homepage.name: Zitadel
- homepage.icon=zitadel.svg homepage.href: https://id.${MY_TLD}
- homepage.description=Centralized authentication management homepage.icon: zitadel.svg
homepage.description: Centralized authentication management
volumes: volumes:
- ${DOCKER_VOLUME_CONFIG}/zitadel/config.yaml:/config.yaml - ${DOCKER_VOLUME_CONFIG}/zitadel/config.yaml:/config.yaml
- ${DOCKER_VOLUME_CONFIG}/zitadel/init-steps.yaml:/init-steps.yaml - ${DOCKER_VOLUME_CONFIG}/zitadel/init-steps.yaml:/init-steps.yaml