Unverified Commit 153996b8 authored by Tom Moulard's avatar Tom Moulard
Browse files

chore: fix tests

parent 51990926

.env.default

+12 −15
Original line number Diff line number Diff line
@@ -40,6 +40,17 @@ NEXTCLOUD_MYSQL_ROOT_PASSWORD= 
NEXTCLOUD_MYSQL_USER=

NGINX_IMAGE_VERSION=

NODE_EXPORTER_IMAGE_VERSION=

PIHOLE_DNS1=

PIHOLE_DNS2=

PIHOLE_DNSMASQ_LISTENING=

PIHOLE_HOSTNAME=

PIHOLE_IMAGE_VERSION=

PIHOLE_REV_SERVER=

PIHOLE_REV_SERVER_CIDR=

PIHOLE_REV_SERVER_DOMAIN=

PIHOLE_REV_SERVER_TARGET=

PIHOLE_V4_ADDRESS=

PIHOLE_V6_ADDRESS=

PROMETHEUS_IMAGE_VERSION=

REMOTELY_IMAGE_VERSION=

ROOT_EMAIL=
@@ -55,6 +66,7 @@ TOR_RELAY_BANDWIDTH_RATE= 
TOR_RELAY_NICKNAME=

TOR_RELAY_TYPE=

TRAEFIK_CHECK_NEW_VERSION=

TRAEFIK_DNS_ENTRYPOINT=

TRAEFIK_EXPOSED_BY_DEFAULT=

TRAEFIK_IMAGE_VERSION=

TRAEFIK_LOG_LEVEL=
@@ -80,18 +92,3 @@ WATCHTOWER_IMAGE_VERSION= 
WATCHTOWER_ROLLING_RESTART=

WATCHTOWER_SCHEDULE=

WORDPRESS_IMAGE_VERSION=
 


PIHOLE_DNS1=

PIHOLE_DNS2=

PIHOLE_DNSMASQ_LISTENING=

PIHOLE_HOSTNAME=

PIHOLE_IMAGE_VERSION=

PIHOLE_REV_SERVER=

PIHOLE_REV_SERVER_CIDR=

PIHOLE_REV_SERVER_DOMAIN=

PIHOLE_REV_SERVER_TARGET=

PIHOLE_V4_ADDRESS=

PIHOLE_V6_ADDRESS=

PIHOLE_WEBPASSWORD=



TRAEFIK_DNS_ENTRYPOINT=

.github/workflows/dockerpublish.yml

+0 −3
Original line number Diff line number Diff line 
name: 'Tests'



on: # yamllint disable-line rule:truthy

  pull_request:

    branches:

      - '*'

  push: {}



jobs:

.github/workflows/healthcheck.workflow.tmpl.yml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ jobs: 
          ${{ inputs.sus }}

      - name: 'Starting the docker-compose stack'

        run: |

          echo -e "USERS=runner\nUSERNAME=octocat" > .env

          echo -e "USERS=runner\nUSERNAME=octocat\nTRAEFIK_DNS_ENTRYPOINT=8080" > .env

          docker-compose up -d ${{inputs.service_name}}

      - name: 'Waiting for running containers'

        timeout-minutes: '${{ inputs.timeout-minutes }}'

test_config.yml

+6 −6
Original line number Diff line number Diff line
@@ -1176,7 +1176,7 @@ services: 
      DNS2: 1.0.0.1

      DNSMASQ_LISTENING: all

      FTLCONF_REPLY_ADDR4: 0.0.0.0

      FTLCONF_REPLY_ADDR6: "::"

      FTLCONF_REPLY_ADDR6: '::'

      HOSTNAME: pihole

      REV_SERVER: "false"

      REV_SERVER_CIDR: 192.168.0.0/24
@@ -1184,7 +1184,7 @@ services: 
      REV_SERVER_TARGET: 192.168.0.1

      TZ: Europe/Paris

      VIRTUAL_HOST: pihole.localhost

      WEBPASSWORD: changeme

      WEBPASSWORD: ""

    healthcheck:

      test:

      - CMD
@@ -1193,7 +1193,7 @@ services: 
      - +tries=1

      - '@127.0.0.1'

      - pi-hole.net

    image: pihole/pihole:2024.05.0

    image: pihole/pihole:2025.11.1

    labels:

      traefik.enable: "true"

      traefik.http.routers.pihole.entrypoints: websecure
@@ -1203,10 +1203,10 @@ services: 
      traefik.tcp.routers.pihole-dns.entrypoints: dns-tcp

      traefik.tcp.routers.pihole-dns.rule: HostSNI(`*`)

      traefik.tcp.routers.pihole-dns.service: pihole-dns

      traefik.tcp.services.pihole-dns.loadbalancer.server.port: 53

      traefik.tcp.services.pihole-dns.loadbalancer.server.port: "53"

      traefik.udp.routers.pihole-dns.entrypoints: dns-udp

      traefik.udp.routers.pihole-dns.service: pihole-dns

      traefik.udp.services.pihole-dns.loadbalancer.server.port: 53

      traefik.udp.services.pihole-dns.loadbalancer.server.port: "53"

    networks:

      srv: null

    restart: always
@@ -1728,7 +1728,7 @@ services: 
      - traefik

      - healthcheck

      - --ping

    image: traefik:v3.0

    image: traefik:v3

    labels:

      traefik.enable: "true"

      traefik.http.middlewares.basic_auth.basicauth.removeHeader: "true"