chore: add/fix healthcheck, lint, and update grafana, jackett, rc, and traefik (#37) (2a5733f5) · Commits · for-linux-in-general / docker / bmake-my-server

.env.default

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ TRAEFIK_CHECK_NEW_VERSION=
		TRAEFIK_EXPOSED_BY_DEFAULT=
		TRAEFIK_IMAGE_VERSION=
		TRAEFIK_LOG_LEVEL=
		TRAEFIK_PILOT_TOKEN=
		TRAEFIK_PLUGINS=
		TRAEFIK_SEND_ANONYMOUS_USAGE=
		TRAEFIK_WEBSECURE_ENTRYPOINT=

.github/workflows/dockerpublish.yml

+24 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,9 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs
		Health-checks-nginx:
		runs-on: ubuntu-latest
		env:
		@@ -58,6 +61,9 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs
		Health-checks-hugo:
		runs-on: ubuntu-latest
		env:
		@@ -77,6 +83,9 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs
		Health-checks-peertube:
		runs-on: ubuntu-latest
		env:
		@@ -96,6 +105,9 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs
		Health-checks-transmission:
		runs-on: ubuntu-latest
		env:
		@@ -115,6 +127,9 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs
		Health-checks-nextcloud:
		runs-on: ubuntu-latest
		env:
		@@ -134,6 +149,9 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs
		Health-checks-jackett:
		runs-on: ubuntu-latest
		env:
		@@ -153,6 +171,9 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs
		Health-checks-codimd:
		runs-on: ubuntu-latest
		env:
		@@ -172,3 +193,6 @@ jobs:
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps
		- name: Check health
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml ps \| grep "Up (healthy)"
		- name: Export logs
		if: ${{ failure() }}
		run: docker-compose -f docker-compose.yml -f ${SERVICE}/docker-compose.${SERVICE}.yml logs

grafana/docker-compose.grafana.yml

+17 −5

Original line number	Diff line number	Diff line
		@@ -11,18 +11,24 @@ services:
		restart: always
		depends_on:
		- prometheus
		healthcheck:
		test: ['CMD', 'curl', '0.0.0.0:3000/healthz'] # https://github.com/grafana/grafana/pull/27536
		labels:
		- 'traefik.enable=true'
		- 'traefik.http.routers.grafana.rule=Host(`grafana.${SITE:-localhost}`)'
		- 'traefik.http.services.grafana.loadbalancer.server.port=3000'
		- 'traefik.http.routers.grafana.middlewares=basic_auth@docker'
		environment:
		- 'GF_METRICS_ENABLED=true'
		# https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#reporting_enabled
		- 'GF_ANALYTICS_REPORTING_ENABLED=false'
		- 'GF_AUTH_ANONYMOUS_ENABLED=true'
		- 'GF_AUTH_ANONYMOUS_ORG_ROLE=Admin'
		- 'GF_AUTH_BASIC_ENABLED=false'
		- 'GF_AUTH_DISABLE_LOGIN_FORM=true'
		- 'GF_AUTH_DISABLE_SIGNOUT_MENU=true'
		- 'GF_INSTALL_PLUGINS=grafana-piechart-panel'
		- 'GF_METRICS_ENABLED=true'
		- 'GF_USERS_ALLOW_SIGN_UP=false'

		prometheus:
		image: prom/prometheus:v2.22.0
		@@ -40,6 +46,8 @@ services:
		- node_exporter
		- alertmanager
		- cadvisor
		healthcheck:
		test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:9090 \|\| exit 1"]
		volumes:
		- './grafana/prometheus/data:/prometheus'
		- './grafana/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml'
		@@ -53,27 +61,32 @@ services:
		node_exporter:
		image: prom/node-exporter:v1.0.1
		restart: always
		networks:
		- 'srv'
		healthcheck:
		test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:9100/metrics \|\| exit 1"]
		labels:
		- 'traefik.enable=true'
		- 'traefik.http.routers.node_exporter.rule=Host(`node_exporter.${SITE:-localhost}`)'
		- 'traefik.http.services.node_exporter.loadbalancer.server.port=9100'
		- 'traefik.http.routers.node_exporter.middlewares=basic_auth@docker'
		networks:
		- 'srv'

		alertmanager:
		image: prom/alertmanager:v0.21.0
		restart: always
		networks:
		- 'srv'
		healthcheck:
		test: ["CMD-SHELL", "wget -q --spider --proxy=off localhost:9093/metrics \|\| exit 1"]
		labels:
		- 'traefik.enable=true'
		- 'traefik.http.routers.alertmanager.rule=Host(`alertmanager.${SITE:-localhost}`)'
		- 'traefik.http.services.alertmanager.loadbalancer.server.port=9093'
		- 'traefik.http.routers.alertmanager.middlewares=basic_auth@docker'
		restart: always

		cadvisor:
		image: gcr.io/cadvisor/cadvisor:latest
		restart: always
		volumes:
		- '/:/rootfs:ro'
		- '/var/run:/var/run:ro'
		@@ -84,7 +97,6 @@ services:
		privileged: true
		networks:
		- 'srv'
		restart: always
		labels:
		- 'traefik.enable=true'
		- 'traefik.http.routers.cadvisor.rule=Host(`cadvisor.${SITE:-localhost}`)'

jackett/docker-compose.jackett.yml

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,8 @@ services:
		volumes:
		- ./jackett/config:/config
		- ./jackett/downloads:/downloads
		dns:
		- 1.1.1.1
		networks:
		- 'srv'
		restart: always

rocketchat/docker-compose.rocket-chat.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ services:

		rocketchat-mongo-replica:
		image: mongo:4.0
		command: 'mongo rocketchat-mongo/rocketchat --eval "rs.initiate({ _id: ''rs01'', members: [ { _id: 0, host: ''localhost:27017'' } ]})"'
		command: 'mongo rocketchat-mongo/rocketchat --eval "rs.initiate({ _id: ''rs01'', members: [ { _id: 0, host: ''rocketchat-mongo:27017'' } ]})"'
		networks:
		- 'rocketchat-internal'
		depends_on: