IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix paths for auth/ build and volume paths (#54828)

Browse Source
This commit is contained in:
linoman 2022-09-07 10:53:58 +02:00 committed by GitHub
parent 86e432f25b
commit 0324e9c60e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devenv/docker/blocks/auth/apache_proxy/docker-compose.yaml
View File

@ -5,5 +5,5 @@
# root_url = %(protocol)s://%(domain)s:10081/grafana/ # root_url = %(protocol)s://%(domain)s:10081/grafana/
apacheproxy: apacheproxy:
build: docker/blocks/apache_proxy build: docker/blocks/auth/apache_proxy
network_mode: host network_mode: host

2
devenv/docker/blocks/auth/apache_proxy_mac/docker-compose.yaml
View File

@ -5,6 +5,6 @@
# root_url = %(protocol)s://%(domain)s:10081/grafana/ # root_url = %(protocol)s://%(domain)s:10081/grafana/
apacheproxy: apacheproxy:
build: docker/blocks/apache_proxy_mac build: docker/blocks/auth/apache_proxy_mac
ports: ports:
- "10081:10081" - "10081:10081"

2
devenv/docker/blocks/auth/jwt_proxy/docker-compose.yaml
View File

@ -6,7 +6,7 @@
POSTGRES_USER: keycloak POSTGRES_USER: keycloak
POSTGRES_PASSWORD: password POSTGRES_PASSWORD: password
volumes: volumes:
- ./docker/blocks/jwt_proxy/cloak.sql:/docker-entrypoint-initdb.d/cloak.sql - ./docker/blocks/auth/jwt_proxy/cloak.sql:/docker-entrypoint-initdb.d/cloak.sql
restart: unless-stopped restart: unless-stopped
oauthkeycloak: oauthkeycloak:

2
devenv/docker/blocks/auth/nginx_proxy/docker-compose.yaml
View File

@ -5,5 +5,5 @@
# root_url = %(protocol)s://%(domain)s:10080/grafana/ # root_url = %(protocol)s://%(domain)s:10080/grafana/
nginxproxy: nginxproxy:
build: docker/blocks/nginx_proxy build: docker/blocks/auth/nginx_proxy
network_mode: host network_mode: host

2
devenv/docker/blocks/auth/nginx_proxy_mac/docker-compose.yaml
View File

@ -5,7 +5,7 @@
# root_url = %(protocol)s://%(domain)s:10080/grafana/ # root_url = %(protocol)s://%(domain)s:10080/grafana/
nginxproxy: nginxproxy:
build: docker/blocks/nginx_proxy_mac build: docker/blocks/auth/nginx_proxy_mac
ports: ports:
- "10080:10080" - "10080:10080"

4
devenv/docker/blocks/auth/openldap-mac/docker-compose.yaml
View File

@ -11,5 +11,5 @@
- 636:636 - 636:636
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ./docker/blocks/openldap-mac/prepopulate/:/tmp/smt/ - ./docker/blocks/auth/openldap-mac/prepopulate/:/tmp/smt/
- ./docker/blocks/openldap-mac/modules/:/tmp/smt/ - ./docker/blocks/auth/openldap-mac/modules/:/tmp/smt/

4
devenv/docker/blocks/auth/openldap-multiple/docker-compose.yaml
View File

@ -1,6 +1,6 @@
admins-openldap: admins-openldap:
build: build:
context: docker/blocks/multiple-openldap context: docker/blocks/auth/openldap-multiple
dockerfile: ./admins-ldap-server.Dockerfile dockerfile: ./admins-ldap-server.Dockerfile
environment: environment:
SLAPD_PASSWORD: grafana SLAPD_PASSWORD: grafana
@ -11,7 +11,7 @@
openldap: openldap:
build: build:
context: docker/blocks/multiple-openldap context: docker/blocks/auth/openldap-multiple
dockerfile: ./ldap-server.Dockerfile dockerfile: ./ldap-server.Dockerfile
environment: environment:
SLAPD_PASSWORD: grafana SLAPD_PASSWORD: grafana

2
devenv/docker/blocks/auth/prometheus_basic_auth_proxy/docker-compose.yaml
View File

@ -2,6 +2,6 @@
# http://prometheus:9090 (Prometheus inside the docker compose) # http://prometheus:9090 (Prometheus inside the docker compose)
nginxproxy: nginxproxy:
build: docker/blocks/prometheus_basic_auth_proxy build: docker/blocks/auth/prometheus_basic_auth_proxy
ports: ports:
- "10090:10090" - "10090:10090"

2
devenv/docker/blocks/auth/saml/docker-compose.yaml
View File

@ -11,6 +11,6 @@
- "8080:8080" - "8080:8080"
- "8443:8443" - "8443:8443"
volumes: volumes:
- ./docker/blocks/saml/users.php:/var/www/simplesamlphp/config/authsources.php - ./docker/blocks/auth/saml/users.php:/var/www/simplesamlphp/config/authsources.php