Merging develop into main

Dockerfile

@@ -12,13 +12,13 @@ LABEL com.example.vendor="LakeDrops" \
 
 ARG ALPINE_VERSION
 ARG PHP_MAJOR_VERSION
-ARG compose_version=2.18.1
-ARG buildx_version=0.10.5
+ARG compose_version=2.19.0
+ARG buildx_version=0.11.0
 ARG glibc_version=2.35-r1
 ARG apkArch
 ARG dockerArch
 ARG DOCKER_CHANNEL=stable
-ARG DOCKER_VERSION=23.0.3
+ARG DOCKER_VERSION=24.0.2
 ARG GIT_EXTRAS_VERSION=7.0.0
 ARG AHOY_VERSION=2.1.1
 ARG GLAB_VERSION=1.30.0
@@ -29,7 +29,7 @@ ADD etc/* /etc/
 
 RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     set -eux && \
-  	\
+    \
     apkArch="$(apk --print-arch)" && \
     case "$apkArch" in \
       x86_64) dockerArch='x86_64' ;; \