Merge branch 'develop' into 'main'

Merging develop into main

See merge request !68

Dockerfile

@@ -13,18 +13,19 @@ LABEL com.example.vendor="LakeDrops" \
 ARG ALPINE_VERSION
 ARG PHP_MAJOR_VERSION
 ARG AHOY_VERSION=2.1.1
-ARG DIFFTASTIC_VERSION=0.55.0
+ARG DIFFTASTIC_VERSION=0.56.1
 ARG DOCKER_CHANNEL=stable
 # Check for latest at https://download.docker.com/linux/static/stable/x86_64/
-ARG DOCKER_VERSION=25.0.3
+ARG DOCKER_VERSION=26.0.0
 ARG GIT_EXTRAS_VERSION=7.1.0
-ARG GLAB_VERSION=1.36.0
+ARG GLAB_VERSION=1.37.0
 ARG apkArch
-ARG buildx_version=0.12.1
+ARG buildx_version=0.13.1
 # IMPORTANT: keep the docker compose version in sync with the Ansible Docker role.
-ARG compose_version=2.24.5
-ARG composer_version=2.7.1
+ARG compose_version=2.25.0
+ARG composer_version=2.7.2
 ARG dockerArch
+ARG fx_version=33.0.0
 ARG glibc_version=2.35-r1
 ARG yq_version=4.42.1
 
@@ -61,6 +62,12 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     fi && \
     chmod +x /usr/local/bin/yq && \
     \
+    if ! curl -fSL -o /usr/local/bin/fx "https://github.com/antonmedv/fx/releases/download/${fx_version}/fx_linux_amd64"; then \
+      echo >&2 "error: failed to download 'fx'"; \
+      exit 1; \
+    fi && \
+    chmod +x /usr/local/bin/fx && \
+    \
     mkdir -p /root/.ssh && \
     echo "StrictHostKeyChecking no" >> /root/.ssh/config && \
     \