giles
/
stack
Archived
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

.
continuous-integration/drone/push Build was killed Details

This commit is contained in:
Giles Bradshaw 2020-05-01 15:28:18 +01:00
parent a1678d42b1
commit 95247ebe16
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker-compose.yml
View File

@ -19,6 +19,8 @@ services:
- REMOTE_PROXY_PASS=http://guacamole:8080/guacamole/ - REMOTE_PROXY_PASS=http://guacamole:8080/guacamole/
- DRONE_PROXY_PASS=http://drone-server:8080 - DRONE_PROXY_PASS=http://drone-server:8080
- REGISTRY_PROXY_PASS=http://registry-1:5000 - REGISTRY_PROXY_PASS=http://registry-1:5000
- PORTAINER_PROXY_PASS=http://portainer:8000
- PORTAINER_LOCATION=/portainer/
- GIT_LOCATION=/git/ - GIT_LOCATION=/git/
- BLOG_LOCATION=/ - BLOG_LOCATION=/
- CHAT_LOCATION=/chat/ - CHAT_LOCATION=/chat/
@ -353,12 +355,9 @@ services:
constraints: [node.role == manager] constraints: [node.role == manager]
restart_policy: restart_policy:
condition: any condition: any
ports:
- 9000:9000
- 8000:8000
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- portainer_data:/data - portainer-data:/data
networks: networks:
#- proxy #- proxy
- appnet - appnet
@ -393,6 +392,7 @@ volumes:
ghost-content: ghost-content:
mongo-chat: mongo-chat:
chat-uploads: chat-uploads:
portainer-data:
networks: networks:
appnet: appnet:

10
letsencrypt-nginx/conf/git.conf
View File

@ -129,6 +129,14 @@
proxy_buffering off; proxy_buffering off;
proxy_pass ${BLOG_PROXY_PASS}; proxy_pass ${BLOG_PROXY_PASS};
} }
location ${PORTAINER_LOCATION} {
proxy_set_header Host ${DOLLAR}http_host;
proxy_set_header X-Real-IP ${DOLLAR}remote_addr;
proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
proxy_buffering off;
proxy_pass ${PORTAINER_PROXY_PASS};
}
location ${CHAT_LOCATION}sockjs { location ${CHAT_LOCATION}sockjs {
proxy_pass ${CHAT_PROXY_PASS}/chat/sockjs; proxy_pass ${CHAT_PROXY_PASS}/chat/sockjs;
@ -182,7 +190,7 @@
proxy_redirect off; proxy_redirect off;
} }
location ${REMOTE_LOCATION}websocket-tunnel/ { location ${REMOTE_LOCATION}websocket-tunnel/ {
proxy_pass ${REMOTE_PROXY_PASS}websocket-tunnel/; proxy_pass ${REMOTE_PROXY_PASS}websocket-tunnel/;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade ${DOLLAR}http_upgrade; proxy_set_header Upgrade ${DOLLAR}http_upgrade;