verbis-admin
/
bridgehead
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23 from samply/fix/proxyFix

This commit is contained in:
Martin Lablans 2022-10-24 15:23:43 +02:00 committed by GitHub
parent 2b78835872 428f7293e6
commit 47e45819ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ccp/docker-compose.yml
View File

@ -31,12 +31,13 @@ services:
forward_proxy: forward_proxy:
container_name: bridgehead-forward-proxy container_name: bridgehead-forward-proxy
image: samply/bridgehead-forward-proxy:develop image: samply/bridgehead-forward-proxy:latest
environment: environment:
http_proxy: ${HTTP_PROXY_URL} HTTPS_PROXY: ${HTTPS_PROXY_URL}
https_proxy: ${HTTPS_PROXY_URL} USERNAME: ${HTTPS_PROXY_USERNAME}
PASSWORD: ${HTTPS_PROXY_PASSWORD}
volumes: volumes:
- "bridgehead-proxy:/var/log/squid" - /etc/bridgehead/trusted-ca-certs:/docker/custom-certs/:ro
landing: landing:
container_name: bridgehead-landingpage container_name: bridgehead-landingpage
@ -72,6 +73,7 @@ services:
spot: spot:
image: samply/spot:latest image: samply/spot:latest
container_name: bridgehead-spot
environment: environment:
SECRET: ${SPOT_BEAM_SECRET_LONG} SECRET: ${SPOT_BEAM_SECRET_LONG}
APPID: spot APPID: spot
@ -97,17 +99,19 @@ services:
PRIVKEY_FILE: /run/secrets/proxy.pem PRIVKEY_FILE: /run/secrets/proxy.pem
RUST_LOG: debug RUST_LOG: debug
ALL_PROXY: http://forward_proxy:3128 ALL_PROXY: http://forward_proxy:3128
TLS_CA_CERTIFICATES_DIR: /conf/trusted-ca-certs
secrets: secrets:
- proxy.pem - proxy.pem
labels: labels:
- "traefik.enable=false" - "traefik.enable=false"
depends_on: depends_on:
- "forward_proxy" - "forward_proxy"
volumes:
- /etc/bridgehead/trusted-ca-certs:/conf/trusted-ca-certs:ro
volumes: volumes:
blaze-data: blaze-data:
bridgehead-proxy:
secrets: secrets:
proxy.pem: proxy.pem: