diff --git a/docker-compose-registry.yml b/docker-compose-registry.yml index 87bfe6c..2b4729c 100644 --- a/docker-compose-registry.yml +++ b/docker-compose-registry.yml @@ -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} diff --git a/drone-starlark/repos/stack/drone.star b/drone-starlark/repos/stack/drone.star index ad39450..d9d0c9e 100644 --- a/drone-starlark/repos/stack/drone.star +++ b/drone-starlark/repos/stack/drone.star @@ -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, diff --git a/letsencrypt-nginx/conf/git.conf b/letsencrypt-nginx/conf/git.conf index 234f0ac..5d8e42a 100644 --- a/letsencrypt-nginx/conf/git.conf +++ b/letsencrypt-nginx/conf/git.conf @@ -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";