Rename "local-net" to default and fix healthcheck network
This commit is contained in:
		
							parent
							
								
									c32e305eb3
								
							
						
					
					
						commit
						1d074bf14b
					
				
					 9 changed files with 10 additions and 29 deletions
				
			
		| 
						 | 
				
			
			@ -6,12 +6,12 @@ compose_file_main:
 | 
			
		|||
      labels:
 | 
			
		||||
        com.centurylinklabs.watchtower.enable: "{{ compose.watchtower | default(false) }}"
 | 
			
		||||
      networks:
 | 
			
		||||
        local-net:
 | 
			
		||||
        default:
 | 
			
		||||
        apps:
 | 
			
		||||
          aliases:
 | 
			
		||||
            - "{{ svc.name }}"
 | 
			
		||||
  networks:
 | 
			
		||||
    local-net:
 | 
			
		||||
    default:
 | 
			
		||||
    apps:
 | 
			
		||||
      external: true
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -27,6 +27,6 @@ compose:
 | 
			
		|||
        privileged: true
 | 
			
		||||
        command: "dockerd -H tcp://0.0.0.0:2375 --tls=false"
 | 
			
		||||
        networks:
 | 
			
		||||
          local-net:
 | 
			
		||||
          default:
 | 
			
		||||
    volumes:
 | 
			
		||||
      data:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -10,6 +10,7 @@ x-common-elements:
 | 
			
		|||
    - service.env
 | 
			
		||||
  volumes:
 | 
			
		||||
    - ./data/:/opt
 | 
			
		||||
  network_mode: host
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  http:
 | 
			
		||||
| 
						 | 
				
			
			@ -21,8 +22,3 @@ services:
 | 
			
		|||
  mail:
 | 
			
		||||
    <<: *common-elements
 | 
			
		||||
    command: "/opt/mail"
 | 
			
		||||
 | 
			
		||||
networks:
 | 
			
		||||
  default:
 | 
			
		||||
    name: healthcheck
 | 
			
		||||
    external: true
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -63,7 +63,7 @@ svc_yml:
 | 
			
		|||
 | 
			
		||||
compose:
 | 
			
		||||
  watchtower: false
 | 
			
		||||
  image: influxdb:2
 | 
			
		||||
  image: influxdb:2.7
 | 
			
		||||
  volumes:
 | 
			
		||||
    - ./influxdb.yml:/etc/influxdb2/config.yml
 | 
			
		||||
    - data:{{ svc.data_dir }}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -56,7 +56,7 @@ compose:
 | 
			
		|||
          - nginx_config:/opt/recipes/nginx/conf.d
 | 
			
		||||
          - mediafiles:/opt/recipes/mediafiles
 | 
			
		||||
        networks:
 | 
			
		||||
          local-net:
 | 
			
		||||
          default:
 | 
			
		||||
    volumes:
 | 
			
		||||
      nginx_config:
 | 
			
		||||
      staticfiles:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -37,7 +37,7 @@ compose:
 | 
			
		|||
        volumes:
 | 
			
		||||
          - app:/var/www/html
 | 
			
		||||
        networks:
 | 
			
		||||
          local-net:
 | 
			
		||||
          default:
 | 
			
		||||
 | 
			
		||||
      updater:
 | 
			
		||||
        image: cthulhoo/ttrss-fpm-pgsql-static
 | 
			
		||||
| 
						 | 
				
			
			@ -50,7 +50,7 @@ compose:
 | 
			
		|||
          - tt-rss
 | 
			
		||||
        command: /opt/tt-rss/updater.sh
 | 
			
		||||
        networks:
 | 
			
		||||
          local-net:
 | 
			
		||||
          default:
 | 
			
		||||
    volumes:
 | 
			
		||||
      app:
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -20,4 +20,4 @@ compose:
 | 
			
		|||
        labels:
 | 
			
		||||
          com.centurylinklabs.watchtower.enable: true
 | 
			
		||||
    networks:
 | 
			
		||||
      local-net:
 | 
			
		||||
      default:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -50,4 +50,4 @@ compose:
 | 
			
		|||
        volumes:
 | 
			
		||||
          - /var/run/docker.sock:/var/run/docker.sock
 | 
			
		||||
        networks:
 | 
			
		||||
          local-net:
 | 
			
		||||
          default:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,15 +0,0 @@
 | 
			
		|||
USER_AGENT="healthcheck-bot for serguzim.net"
 | 
			
		||||
 | 
			
		||||
HTTP_HC_UID=
 | 
			
		||||
 | 
			
		||||
MATRIX_SERVER="https://matrix.msrg.cc"
 | 
			
		||||
MATRIX_SERVER_FEDTESTER="msrg.cc"
 | 
			
		||||
MATRIX_HC_UID=
 | 
			
		||||
MATRIX_TOKEN=
 | 
			
		||||
MATRIX_ROOM=
 | 
			
		||||
 | 
			
		||||
MAIL_HC_UID=
 | 
			
		||||
MAIL_HOST=mail.serguzim.me
 | 
			
		||||
MAIL_PORT=587
 | 
			
		||||
MAIL_USER=healthcheck@serguzim.me
 | 
			
		||||
MAIL_PASS=
 | 
			
		||||
		Reference in a new issue