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

zabbix db
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Giles Bradshaw 2020-05-05 22:08:39 +01:00
parent b803e16927
commit 2d841ed30a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker-compose.yml
View File

@ -398,7 +398,7 @@ services:
networks: networks:
- appnet - appnet
volumes: volumes:
- matomo-mariadb:/var/lib/mysql - zabbix-mariadb:/var/lib/mysql
environment: environment:
MYSQL_ROOT_PASSWORD: ${ZABBIX_MYSQL_ROOT_PASSWORD} MYSQL_ROOT_PASSWORD: ${ZABBIX_MYSQL_ROOT_PASSWORD}
MYSQL_USER: zabbix MYSQL_USER: zabbix
@ -519,6 +519,7 @@ volumes:
portainer-data: portainer-data:
matomo: matomo:
matomo-mariadb: matomo-mariadb:
zabbix-mariadb:
networks: networks:
appnet: appnet:

4
drone-starlark/repos/deploy.star
View File

@ -30,8 +30,8 @@ def deploy(
"export DRONE_COMMIT={commit}".format(commit=ctx.build.commit), "export DRONE_COMMIT={commit}".format(commit=ctx.build.commit),
"docker network prune -f", "docker network prune -f",
"cd {folder}".format(folder=folder), "cd {folder}".format(folder=folder),
# "docker stack rm {name}".format(name = name), "docker stack rm {name}".format(name = name),
# "sleep 30", "sleep 30",
"docker stack deploy -c {filename} {name}".format(name= name, filename = filename), "docker stack deploy -c {filename} {name}".format(name= name, filename = filename),
] + commands ] + commands
} }

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

@ -128,7 +128,7 @@ server {
# required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486) # required to avoid HTTP 411: see Issue #1486 (https://github.com/moby/moby/issues/1486)
chunked_transfer_encoding on; chunked_transfer_encoding on;
server_name ${SERVER_NAME}; server_name ${SERVER_NAME};
location ~ /v2/(.*) { location /v2/ {
resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns resolver 127.0.0.11 ipv6=off valid=30s; ## internal docker dns
# Do not allow connections from docker 1.5 and earlier # 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 # 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-For ${DOLLAR}proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme; proxy_set_header X-Forwarded-Proto ${DOLLAR}scheme;
proxy_buffering off; proxy_buffering off;
set ${DOLLAR}upstream ${REGISTRY_PROXY_PASS}/v2/${DOLLAR}1${DOLLAR}is_args${DOLLAR}args; #set ${DOLLAR}upstream ${REGISTRY_PROXY_PASS}/${DOLLAR}1${DOLLAR}is_args${DOLLAR}args;
proxy_pass ${DOLLAR}upstream; proxy_pass ${REGISTRY_PROXY_PASS};
} }
} }