diff --git a/docker-compose.yml b/docker-compose.yml index d6645bb..c85f813 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -398,7 +398,7 @@ services: networks: - appnet volumes: - - matomo-mariadb:/var/lib/mysql + - zabbix-mariadb:/var/lib/mysql environment: MYSQL_ROOT_PASSWORD: ${ZABBIX_MYSQL_ROOT_PASSWORD} MYSQL_USER: zabbix @@ -519,6 +519,7 @@ volumes: portainer-data: matomo: matomo-mariadb: + zabbix-mariadb: networks: appnet: diff --git a/drone-starlark/repos/deploy.star b/drone-starlark/repos/deploy.star index 5f54307..0f9dda1 100644 --- a/drone-starlark/repos/deploy.star +++ b/drone-starlark/repos/deploy.star @@ -30,8 +30,8 @@ def deploy( "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit), "docker network prune -f", "cd {folder}".format(folder=folder), - # "docker stack rm {name}".format(name = name), - # "sleep 30", + "docker stack rm {name}".format(name = name), + "sleep 30", "docker stack deploy -c {filename} {name}".format(name= name, filename = filename), ] + commands } diff --git a/letsencrypt-nginx/conf/git.conf b/letsencrypt-nginx/conf/git.conf index 9efbfcf..c8caf14 100644 --- a/letsencrypt-nginx/conf/git.conf +++ b/letsencrypt-nginx/conf/git.conf @@ -128,7 +128,7 @@ server { # required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486) chunked_transfer_encoding on; server_name ${SERVER_NAME}; - location ~ /v2/(.*) { + location /v2/ { resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns # Do not allow connections from docker 1.5 and earlier # docker pre-1.6.0 did not properly set the user agent on ping, catch "Go *" user agents @@ -141,8 +141,8 @@ server { proxy_set_header X-Forwarded-For ${DOLLAR}proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme; proxy_buffering off; - set ${DOLLAR}upstream ${REGISTRY_PROXY_PASS}/v2/${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; - proxy_pass ${DOLLAR}upstream; + #set ${DOLLAR}upstream ${REGISTRY_PROXY_PASS}/${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; + proxy_pass ${REGISTRY_PROXY_PASS}; } }