✏️ fix path of gantt and made improvements for passbolt-problems
This commit is contained in:
parent
71853d33ae
commit
102caf200d
2 changed files with 10 additions and 7 deletions
|
|
@ -6,14 +6,17 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- type: bind
|
- type: bind
|
||||||
source: ${DIST_PATH}
|
source: ${DIST_PATH}
|
||||||
target: /usr/share/nginx/html:ro
|
target: /usr/share/nginx/html
|
||||||
|
read_only: true
|
||||||
bind:
|
bind:
|
||||||
create_host_path: true
|
create_host_path: true
|
||||||
- type: bind
|
- type: bind
|
||||||
source: ${CONFIG_PATH}
|
source: ${CONFIG_PATH}
|
||||||
target: /etc/nginx/conf.d/default.conf:ro
|
target: /etc/nginx/conf.d/default.conf
|
||||||
|
read_only: true
|
||||||
bind:
|
bind:
|
||||||
create_host_path: true
|
create_host_path: true
|
||||||
|
|
||||||
logging:
|
logging:
|
||||||
driver: "json-file"
|
driver: "json-file"
|
||||||
options:
|
options:
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ services:
|
||||||
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
|
test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 10
|
retries: 10
|
||||||
|
start_period: 30s
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=${DB_MYSQL_ROOT_PASSWORD}
|
- MYSQL_ROOT_PASSWORD=${DB_MYSQL_ROOT_PASSWORD}
|
||||||
- MYSQL_DATABASE=${DB_DATABASE}
|
- MYSQL_DATABASE=${DB_DATABASE}
|
||||||
|
|
@ -25,7 +26,9 @@ services:
|
||||||
max-size: "10m"
|
max-size: "10m"
|
||||||
max-file: "3"
|
max-file: "3"
|
||||||
networks:
|
networks:
|
||||||
- internal_net
|
internal_net:
|
||||||
|
aliases:
|
||||||
|
- passbolt-db
|
||||||
|
|
||||||
passbolt:
|
passbolt:
|
||||||
image: passbolt/passbolt:latest-ce
|
image: passbolt/passbolt:latest-ce
|
||||||
|
|
@ -72,14 +75,11 @@ services:
|
||||||
- "traefik.http.routers.${ROUTER_NAME}.tls.certresolver=${CERTIFICATE_RESOLVER}"
|
- "traefik.http.routers.${ROUTER_NAME}.tls.certresolver=${CERTIFICATE_RESOLVER}"
|
||||||
- "traefik.http.services.${ROUTER_NAME}.loadbalancer.server.port=80"
|
- "traefik.http.services.${ROUTER_NAME}.loadbalancer.server.port=80"
|
||||||
- "traefik.docker.network=${TRAEFIK_NETWORK}"
|
- "traefik.docker.network=${TRAEFIK_NETWORK}"
|
||||||
|
|
||||||
- "traefik.http.routers.${ROUTER_NAME}.middlewares=passbolt-headers@docker"
|
- "traefik.http.routers.${ROUTER_NAME}.middlewares=passbolt-headers@docker"
|
||||||
- "traefik.http.middlewares.passbolt-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
|
- "traefik.http.middlewares.passbolt-headers.headers.customrequestheaders.X-Forwarded-Proto=https"
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
traefik:
|
traefik:
|
||||||
name: traefik
|
|
||||||
external: true
|
external: true
|
||||||
internal_net:
|
internal_net:
|
||||||
driver: bridge
|
driver: bridge
|
||||||
name: passbolt_internal_net
|
|
||||||
Loading…
Reference in a new issue