Merge branch 'develop' into 'main'

Merging develop into main

See merge request !61

Dockerfile

@@ -12,16 +12,17 @@ LABEL com.example.vendor="LakeDrops" \
 
 ARG ALPINE_VERSION
 ARG PHP_MAJOR_VERSION
-ARG compose_version=2.21.0
-ARG buildx_version=0.11.2
+ARG compose_version=2.23.3
+ARG buildx_version=0.12.0
 ARG glibc_version=2.35-r1
 ARG apkArch
 ARG dockerArch
 ARG DOCKER_CHANNEL=stable
-ARG DOCKER_VERSION=24.0.2
-ARG GIT_EXTRAS_VERSION=7.0.0
+ARG DOCKER_VERSION=24.0.7
+ARG GIT_EXTRAS_VERSION=7.1.0
 ARG AHOY_VERSION=2.1.1
-ARG GLAB_VERSION=1.33.0
+ARG GLAB_VERSION=1.36.0
+ARG DIFFTASTIC_VERSION=0.53.1
 
 ADD usrbin/column /usr/bin/column
 ADD bin/* /usr/local/bin/
@@ -60,9 +61,11 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     echo "StrictHostKeyChecking no" >> /root/.ssh/config && \
     \
     apk update && \
-    apk add --no-cache openssh wget make patch bash fish zsh python3 git git-lfs unzip acl libpng-dev libzip-dev sudo jq nano rsync && \
+    apk add --no-cache openssh wget make patch bash fish zsh python3 python3-dev git git-lfs unzip acl libc-dev libpng-dev libzip-dev sudo jq nano rsync gcc && \
     ln -sf python3 /usr/bin/python && \
     ln -sf pip3 /usr/bin/pip && \
+    pip3 install wheel && \
+    pip3 install jc && \
     apk add --no-cache mandoc py3-pip gettext && \
     if [ "${ALPINE_VERSION}" != "3.12" ]; then \
       apk add --no-cache bat ; \
@@ -86,6 +89,11 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     apk add --no-cache --allow-untrusted glab_${GLAB_VERSION}_Linux_x86_64.apk && \
     rm glab_${GLAB_VERSION}_Linux_x86_64.apk && \
     \
+    wget -q https://github.com/Wilfred/difftastic/releases/download/${DIFFTASTIC_VERSION}/difft-x86_64-unknown-linux-gnu.tar.gz && \
+    tar -xf difft-x86_64-unknown-linux-gnu.tar.gz && \
+    rm difft-x86_64-unknown-linux-gnu.tar.gz && \
+    mv difft /usr/local/bin/difft && \
+    \
     wget -q https://github.com/ahoy-cli/ahoy/releases/download/v${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
     chmod +x /usr/local/bin/ahoy && \
     \