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-02 00:48:17 +01:00
parent 05e042369a
commit a600bd9018
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose-registry.yml
View File

@ -4,10 +4,10 @@ services:
deploy:
placement:
constraints: [node.labels.com.sigyl.git-stack == yes]
replicas: 0
replicas: 1
restart_policy:
condition: any
image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-git
image: ${LOCAL_DOCKER_REGISTRY}letsencrypt-registry
environment:
- CERTBOT_EMAIL=${CERTBOT_EMAIL}
- SERVER_NAME=${GIT_DOMAIN}

8
drone-starlark/repos/stack/drone.star
View File

@ -83,16 +83,16 @@ def drone(
],
),
deploy(
"docker-compose.yml",
name,
"docker-compose-registry.yml",
'registry',
base,
publicSecrets + secretSecrets,
commands,
ctx
),
deploy(
"docker-compose-registry.yml",
'registry',
"docker-compose.yml",
name,
base,
publicSecrets + secretSecrets,
commands,

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

@ -139,7 +139,8 @@
}
location ${CHAT_LOCATION}sockjs {
proxy_pass ${CHAT_PROXY_PASS}/chat/sockjs;
set $upstream ${CHAT_PROXY_PASS}/chat/sockjs;
proxy_pass $upstream;
proxy_http_version 1.1;
proxy_set_header Upgrade ${DOLLAR}http_upgrade;
proxy_set_header Connection "Upgrade";
@ -152,7 +153,8 @@
}
location ${CHAT_LOCATION}sockjs/ {
proxy_pass ${CHAT_PROXY_PASS}/chat/sockjs/;
set $upstream ${CHAT_PROXY_PASS}/chat/sockjs;
proxy_pass $upstream;
proxy_http_version 1.1;
proxy_set_header Upgrade ${DOLLAR}http_upgrade;
proxy_set_header Connection "Upgrade";
@ -166,7 +168,8 @@
}
location ${CHAT_LOCATION} {
proxy_pass ${CHAT_PROXY_PASS};
set $upstream ${CHAT_PROXY_PASS};
proxy_pass $upstream;
proxy_http_version 1.1;
proxy_set_header Upgrade ${DOLLAR}http_upgrade;
proxy_set_header Connection "upgrade";