Correct formatting issues with docker-compose-jwilder-proxy

Signed-off-by: Marcus Vaal <mjvaal@gmail.com>

docker-compose-jwilder-proxy.yml

@@ -2,61 +2,62 @@ version: "3"
 
 # https://github.com/pi-hole/docker-pi-hole/blob/master/README.md
 
-applist:
+services:
-  image: jwilder/nginx-proxy
+  jwilder-proxy:
-  ports:
+    image: jwilder/nginx-proxy
-    - '80:80'
+    ports:
-  environment:
+      - '80:80'
-    DEFAULT_HOST: pihole.yourDomain.lan
+    environment:
-  volumes:
+      DEFAULT_HOST: pihole.yourDomain.lan
-    - '/var/run/docker.sock:/tmp/docker.sock'
+    volumes:
-  restart: always
+      - '/var/run/docker.sock:/tmp/docker.sock'
+    restart: always
 
-pihole:
+  pihole:
-  image: pihole/pihole:latest
+    image: pihole/pihole:latest
-  dns:
+    dns:
-    - 127.0.0.1
+      - 127.0.0.1
-    - 1.1.1.1
+      - 1.1.1.1
-  ports:
+    ports:
-    - '53:53/tcp'
+      - '53:53/tcp'
-    - '53:53/udp'
+      - '53:53/udp'
-    - "67:67/udp"
+      - "67:67/udp"
-    - '8053:80/tcp'
+      - '8053:80/tcp'
-    - "443:443/tcp"
+      - "443:443/tcp"
-  volumes:
+    volumes:
-    - './etc-pihole/:/etc/pihole/'
+      - './etc-pihole/:/etc/pihole/'
-    - './etc-dnsmasq.d/:/etc/dnsmasq.d/'
+      - './etc-dnsmasq.d/:/etc/dnsmasq.d/'
-    # run `touch ./var-log/pihole.log` first unless you like errors
+      # run `touch ./var-log/pihole.log` first unless you like errors
-    # - './var-log/pihole.log:/var/log/pihole.log'
+      # - './var-log/pihole.log:/var/log/pihole.log'
-  # Recommended but not required (DHCP needs NET_ADMIN)
+    # Recommended but not required (DHCP needs NET_ADMIN)
-  #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
+    #   https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
-  cap_add:
+    cap_add:
-   - NET_ADMIN
+      - NET_ADMIN
-  environment:
+    environment:
-    ServerIP: 192.168.41.55
+      ServerIP: 192.168.41.55
-    PROXY_LOCATION: pihole
+      PROXY_LOCATION: pihole
-    VIRTUAL_HOST: pihole.yourDomain.lan
+      VIRTUAL_HOST: pihole.yourDomain.lan
-    VIRTUAL_PORT: 80
+      VIRTUAL_PORT: 80
-  extra_hosts:
+    extra_hosts:
-    # Resolve to nothing domains (terminate connection)
+      # Resolve to nothing domains (terminate connection)
-    - 'nw2master.bioware.com nwn2.master.gamespy.com:0.0.0.0'
+      - 'nw2master.bioware.com nwn2.master.gamespy.com:0.0.0.0'
-    # LAN hostnames for other docker containers using jwilder
+      # LAN hostnames for other docker containers using jwilder
-    - 'yourDomain.lan:192.168.41.55'
+      - 'yourDomain.lan:192.168.41.55'
-    - 'pihole pihole.yourDomain.lan:192.168.41.55'
+      - 'pihole pihole.yourDomain.lan:192.168.41.55'
-    - 'ghost ghost.yourDomain.lan:192.168.41.55'
+      - 'ghost ghost.yourDomain.lan:192.168.41.55'
-    - 'wordpress wordpress.yourDomain.lan:192.168.41.55'
+      - 'wordpress wordpress.yourDomain.lan:192.168.41.55'
-  restart: always
+    restart: always
 
-# Another container you might want to have running through the proxy
+#   Another container you might want to have running through the proxy
-# Note it also have ENV Vars like pihole and a host under pihole's extra_hosts
+#   Note it also have ENV Vars like pihole and a host under pihole's extra_hosts
-#ghost:
+#  ghost:
-#  image: fractalf/ghost
+#    image: fractalf/ghost
-#  ports:
+#    ports:
-#    - '2368:2368/tcp'
+#      - '2368:2368/tcp'
-#  volumes:
+#    volumes:
-#    - '/etc/ghost/:/ghost-override'
+#      - '/etc/ghost/:/ghost-override'
-#  environment:
+#    environment:
-#    PROXY_LOCATION: ghost
+#      PROXY_LOCATION: ghost
-#    VIRTUAL_HOST: ghost.yourDomain.lan
+#      VIRTUAL_HOST: ghost.yourDomain.lan
-#    VIRTUAL_PORT: 2368
+#      VIRTUAL_PORT: 2368
-#  restart: always
+#    restart: always