Merge branch 'master' of github.com:acedanger/docker

nginxproxymanager/docker-compose.yml

@@ -1,46 +0,0 @@
-services:
-  app:
-    image: jc21/nginx-proxy-manager:latest
-    restart: unless-stopped
-    ports:
-      # These ports are in format <host-port>:<container-port>
-      - 80:80 # Public HTTP Port
-      - 443:443 # Public HTTPS Port
-      - 81:81 # Admin Web Port
-      # Add any other Stream port you want to expose
-      # - '21:21' # FTP
-
-      # Uncomment the next line if you uncomment anything in the section
-      # environment:
-      # Uncomment this if you want to change the location of
-      # the SQLite DB file within the container
-      # DB_SQLITE_FILE: "/data/database.sqlite"
-
-      # Uncomment this if IPv6 is not enabled on your host
-      # DISABLE_IPV6: 'true'
-    environment:
-      # Mysql/Maria connection parameters:
-      DB_MYSQL_HOST: db
-      DB_MYSQL_PORT: 3306
-      DB_MYSQL_USER: npm
-      DB_MYSQL_PASSWORD: npm
-      DB_MYSQL_NAME: npm
-    volumes:
-      - ./data:/data
-      - ./letsencrypt:/etc/letsencrypt
-    depends_on:
-      - db
-    labels:
-      - diun.enable=true
-  db:
-    image: jc21/mariadb-aria:latest
-    restart: unless-stopped
-    environment:
-      MYSQL_ROOT_PASSWORD: npm
-      MYSQL_DATABASE: npm
-      MYSQL_USER: npm
-      MYSQL_PASSWORD: npm
-    volumes:
-      - ./mysql:/var/lib/mysql
-    labels:
-      - diun.enable=true

tailscale-subnet-router/compose.yaml

@@ -1,19 +0,0 @@
-services:
-  tailscale:
-    image: tailscale/tailscale
-    container_name: tailscale-subnet-router
-    hostname: docker-router
-    environment:
-      - TS_EXTRA_ARGS=--advertise-routes=192.168.68.0/24 --ssh --advertise-exit-node --reset --hostname=docker-router
-      - TS_STATE_DIR=/var/lib/tailscale
-      - TS_USERSPACE=false
-    volumes:
-      - /var/lib/tailscale:/var/lib/tailscale
-      - /dev/net/tun:/dev/net/tun
-    network_mode: host
-    cap_add:
-      - net_admin
-      - net_raw
-    restart: unless-stopped
-volumes:
-  tailscale-data:

tailscale-subnet-router/resolv.conf

@@ -1,2 +0,0 @@
-nameserver 1.1.1.1
-nameserver 9.9.9.9