Update php Docker tag to v7.4

ansible/assets/basementpi/compose.yml.j2

@@ -1,7 +1,5 @@
+---
 version: "3.5"
-
-# https://github.com/pi-hole/docker-pi-hole/blob/master/README.md
-
 networks:
   network_pihole:
     ipam:
@@ -15,15 +13,13 @@ services:
     ports:
       - '80:80'
     environment:
-      DEFAULT_HOST: {{ pihole_hostname }}.{{ pihole_domain }}
+      - DEFAULT_HOST: "{{ pihole_hostname }}.{{ pihole_domain }}"
     volumes:
       - '/var/run/docker.sock:/tmp/docker.sock'
     restart: always
     networks:
       network_pihole:
         ipv4_address: 172.16.3.6
-
-
   pihole:
     image: pihole/pihole:latest
     ports:
@@ -48,11 +44,11 @@ services:
     environment:
       ServerIP: 10.11.1.10
       PIHOLE_DNS_: unbound# 53;{{ pihole_additional_upstream_dnsservers }}
-      PROXY_LOCATION: {{ pihole_hostname }}
+      PROXY_LOCATION: "{{ pihole_hostname }}"
-      VIRTUAL_HOST: {{ pihole_hostname}}.{{ pihole_domain }}
+      VIRTUAL_HOST: "{{ pihole_hostname}}.{{ pihole_domain }}"
       VIRTUAL_PORT: 80
-      WEBPASSWORD: {{ pihole_password }}
+      WEBPASSWORD: "{{ pihole_password }}"
-      FTLCONF_LOCAL_IPV4: {{ pi_ip }}
+      FTLCONF_LOCAL_IPV4: "{{ pi_ip }}"
       DNSMASQ_LISTENING: all
 
     extra_hosts:
@@ -106,11 +102,11 @@ services:
     restart: always
     pull_policy: always
     environment:
-          APIKey: {{ porkbun_api_key }}
+      APIKey: "{{ porkbun_api_key }}"
-          SecretAPIKey: {{ porkbun_secret_api_key }}
+      SecretAPIKey: "{{ porkbun_secret_api_key }}"
-          Domain: {{ porkbun_domain }}
+      Domain: "{{ porkbun_domain }}"
       Schedule: "{{ porkbun_cron_sched }}"
-          TZ: {{ porkbun_tz }}
+      TZ: "{{ porkbun_tz }}"
     networks:
       network_pihole:
         ipv4_address: 172.16.3.4
@@ -121,11 +117,11 @@ services:
     restart: always
     pull_policy: always
     environment:
-          APIKey: {{ porkbun_api_key }}
+      APIKey: "{{ porkbun_api_key }}"
-          SecretAPIKey: {{ porkbun_secret_api_key }}
+      SecretAPIKey: "{{ porkbun_secret_api_key }}"
-          Domain: {{ porkbun_domain2 }}
+      Domain: "{{ porkbun_domain2 }}"
       Schedule: "{{ porkbun_cron_sched }}"
-          TZ: {{ porkbun_tz }}
+      TZ: "{{ porkbun_tz }}"
     networks:
       network_pihole:
         ipv4_address: 172.16.3.7
@@ -173,38 +169,3 @@ services:
     sysctls:
       - net.ipv4.conf.all.src_valid_mark=1
     restart: unless-stopped
-
-#   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
-#  ghost:
-#    image: fractalf/ghost
-#    ports:
-#      - '2368:2368/tcp'
-#    volumes:
-#      - '/etc/ghost:/ghost-override'
-#    environment:
-#      PROXY_LOCATION: ghost
-#      VIRTUAL_HOST: ghost.yourDomain.lan
-#      VIRTUAL_PORT: 2368
-#    restart: always
-
-#  homeassistant:
-#      container_name: homeassistant
-#      image: "ghcr.io/home-assistant/home-assistant:stable"
-#      volumes:
-#        - ./homeassistant/config:/config
-#        - /etc/localtime:/etc/localtime:ro
-#      restart: unless-stopped
-#      privileged: true
-#      network_mode: host
-#      #environment:
-#      #  - VIRTUAL_HOST=homeassistant.coxgrunow.ca
-#      #  - VIRTUAL_PORT=8123
-  yacy:
-    container_name: yacy
-    image: "docker.io/yacy/yacy_search_server:aarch64-latest"
-    volumes:
-      - ./yacy:/opt/yacy_search_server/DATA
-    ports:
-      - 8090:8090/tcp
-      - 8443:8443/tcp

ansible/assets/docker-ext/compose.yml

@@ -410,7 +410,7 @@ services:
       - "traefik.http.services.healthchecks-http.loadbalancer.server.port=8000"
       - "traefik.http.routers.healthchecks.middlewares=authchain@docker"
   apache:
-    image: php:7.2-apache
+    image: php:7.4-apache
     volumes: 
       - ./apache:/var/www/html
     ports:
@@ -427,7 +427,7 @@ services:
     networks:
       - backend
   apache2:
-    image: php:7.2-apache
+    image: php:7.4-apache
     volumes: 
       - ./apache:/var/www/html
     ports:

ansible/assets/docker-ext/compose.yml.j2

@@ -48,7 +48,6 @@ services:
       - "traefik.http.middlewares.authchain.chain.middlewares=crowdsec@docker,authentik@docker"
       - "traefik.http.middlewares.internalOnly.ipallowlist.sourcerange=192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12"
       - "traefik.http.middlewares.internalOnlyWithAuth.chain.middlewares=internalOnly@docker,crowdsec@docker,authentik@docker"
-        
       # ddclient:
       #  image: lscr.io/linuxserver/ddclient:latest
       #  container_name: ddclient
@@ -410,7 +409,7 @@ services:
       - "traefik.http.services.healthchecks-http.loadbalancer.server.port=8000"
       - "traefik.http.routers.healthchecks.middlewares=authchain@docker"
   apache:
-    image: php:7.2-apache
+    image: php:7.4-apache
     volumes:
       - ./apache:/var/www/html
     ports:
@@ -427,7 +426,7 @@ services:
     networks:
       - backend
   apache2:
-    image: php:7.2-apache
+    image: php:7.4-apache
     volumes:
       - ./apache:/var/www/html
     ports:
@@ -621,9 +620,6 @@ services:
       #        #      test: redis-cli ping || exit 1
       #        #    restart: always
 
-
-
-
 volumes:
   linkace_logs:
   db:
@@ -641,7 +637,4 @@ networks:
   backend:
   proxy:
   docker_default:
-    external: True
+    external: true
-
-
-

ansible/assets/docker-int/compose.yml.j2

@@ -1,3 +1,4 @@
+---
 version: '3.3'
 services:
     traefik:
@@ -58,7 +59,6 @@ services:
         restart: unless-stopped
         volumes:
             - redisdata:/data
-
             #    db:
             #      image: docker.io/library/postgres:15
             #      restart: unless-stopped
@@ -68,7 +68,6 @@ services:
             #        POSTGRES_DB: paperless
             #        POSTGRES_USER: paperless
             #        POSTGRES_PASSWORD: paperless
-
     paperless-webserver:
         image: ghcr.io/paperless-ngx/paperless-ngx:latest
         container_name: paperless-webserver

ansible/assets/git/compose.yml.j2

@@ -1,3 +1,4 @@
+---
 version: "3"
 
 networks:

ansible/assets/gitea/compose.yml.j2

@@ -1,3 +1,4 @@
+---
 version: '3.3'
 services:
   runner: