Merge branch 'master' of https://git.quodatum.duckdns.org/apb/thedocks.git

pihole/docker-compose.yml

@@ -1,39 +1,39 @@
-# pihole
-# https://blog.ivansmirnov.name/set-up-pihole-using-docker-macvlan-network/
-
-version: '2'
-
-services:
-  pihole:
-    container_name: pihole-vlan
-    image: pihole/pihole:2021.12 # check the latest version on docker hub.
-    hostname: pihole # set an easy hostname to remember
-    domainname: local # your local domain name
-    mac_address: de:ad:be:ef:ff:01 # can change or leave this
-    cap_add:
-      - NET_ADMIN
-    networks:
-      macvlan0: # same as network specified below
-        ipv4_address: 192.168.1.59 # the IP of the pihole container
-    dns:
-      - 127.0.0.1 # use local DNS, since the pihole 
-      - 1.1.1.1 # optional fallback DNS
-    ports: # expose all pihole ports.
-      - 443/tcp
-      - 53/tcp
-      - 53/udp
-      - 67/udp
-      - 80/tcp
-    volumes: # mount our data volumes.
-       - './etc-pihole/:/etc/pihole/'
-       - './etc-dnsmasq.d/:/etc/dnsmasq.d/'
-    environment: # set variables for pihole configuration.
-      ServerIP: 192.168.1.59 # must match ipv4_address above
-      VIRTUAL_HOST: pihole.local  # Must be hostname + domainname from above
-      WEBPASSWORD: ""
-      TZ: 'Europe/London' # pick your timezone
-    restart: unless-stopped
-
-networks:
-  macvlan0:   # externally created network (later in article)
-    external: true
+# pihole
+# https://blog.ivansmirnov.name/set-up-pihole-using-docker-macvlan-network/
+
+version: '2'
+
+services:
+  pihole:
+    container_name: pihole-vlan
+    image: pihole/pihole # check the latest version on docker hub.
+    hostname: pihole # set an easy hostname to remember
+    domainname: local # your local domain name
+    mac_address: de:ad:be:ef:ff:01 # can change or leave this
+    cap_add:
+      - NET_ADMIN
+    networks:
+      macvlan0: # same as network specified below
+        ipv4_address: 192.168.1.59 # the IP of the pihole container
+    dns:
+      - 127.0.0.1 # use local DNS, since the pihole 
+      - 1.1.1.1 # optional fallback DNS
+    ports: # expose all pihole ports.
+      - 443/tcp
+      - 53/tcp
+      - 53/udp
+      - 67/udp
+      - 80/tcp
+    volumes: # mount our data volumes.
+       - './etc-pihole/:/etc/pihole/'
+       - './etc-dnsmasq.d/:/etc/dnsmasq.d/'
+    environment: # set variables for pihole configuration.
+      ServerIP: 192.168.1.59 # must match ipv4_address above
+      VIRTUAL_HOST: pihole.local  # Must be hostname + domainname from above
+      WEBPASSWORD: ""
+      TZ: 'Europe/London' # pick your timezone
+    restart: unless-stopped
+
+networks:
+  macvlan0:   # externally created network (later in article)
+    external: true

wsdd/Dockerfile

@@ -1,24 +1,24 @@
-FROM alpine:latest as build
-
-LABEL org.label-schema.build-date=$BUILD_DATE \
-    org.label-schema.name="wsdd" \
-    org.label-schema.description=" Web Service Discovery host daemon (wsdd) in a docker container " \
-    org.label-schema.url="https://guillaumedsde.gitlab.io/docker-wsdd/" \
-    org.label-schema.vcs-ref="$VCS_REF" \
-    org.label-schema.version="$VERSION" \
-    org.label-schema.vcs-url="https://github.com/guillaumedsde/docker-wsdd" \
-    org.label-schema.vendor="guillaumedsde" \
-    org.label-schema.schema-version="1.0"
-
-ARG VERSION=master
-
-WORKDIR /
-
-RUN wget "https://raw.githubusercontent.com/christgau/wsdd/${VERSION}/src/wsdd.py" -O /wsdd \
-    && chmod 755 /wsdd
-
-FROM gcr.io/distroless/python3
-
-COPY --from=build /wsdd /usr/bin/wsdd
-
+FROM alpine:latest as build
+
+LABEL org.label-schema.build-date=$BUILD_DATE \
+    org.label-schema.name="wsdd" \
+    org.label-schema.description=" Web Service Discovery host daemon (wsdd) in a docker container " \
+    org.label-schema.url="https://guillaumedsde.gitlab.io/docker-wsdd/" \
+    org.label-schema.vcs-ref="$VCS_REF" \
+    org.label-schema.version="$VERSION" \
+    org.label-schema.vcs-url="https://github.com/guillaumedsde/docker-wsdd" \
+    org.label-schema.vendor="guillaumedsde" \
+    org.label-schema.schema-version="1.0"
+
+ARG VERSION=master
+
+WORKDIR /
+
+RUN wget "https://raw.githubusercontent.com/christgau/wsdd/${VERSION}/src/wsdd.py" -O /wsdd \
+    && chmod 755 /wsdd
+
+FROM gcr.io/distroless/python3
+
+COPY --from=build /wsdd /usr/bin/wsdd
+
 ENTRYPOINT [ "python", "/usr/bin/wsdd" ] 

wsdd/README.md

@@ -1 +1,4 @@
 🐋 Web Service Discovery host daemon (wsdd)
+
+https://github.com/guillaumedsde/docker-wsdd
+

wsdd/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3'
 
 services:
   wsdd:
-    wsdd: wsdd:0.0.0
+    image: wsdd:0.0.0
     build: .
     container_name: wsdd-docker
     restart: unless-stopped