Merge branch 'develop' into 'main'

Merging develop into main

See merge request !38

.gitlab-ci.yml

@@ -14,7 +14,7 @@ php:
   stage: build
   parallel:
     matrix:
-      - ALPINE: '3.11'
+      - ALPINE: '3.12'
         PHP: '7.4'
       - ALPINE: '3.12'
         PHP: '8.0'

Dockerfile

@@ -62,32 +62,12 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     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 && \
     ln -sf python3 /usr/bin/python && \
     ln -sf pip3 /usr/bin/pip && \
-    if [ "${ALPINE_VERSION}" = "3.11" ]; then \
-      apk add --no-cache mdocml-apropos gettext ; \
-      python -m pip install --upgrade pip ; \
-    elif [ "${ALPINE_VERSION}" = "3.12" ]; then \
-      apk add --no-cache mandoc py3-pip gettext ; \
-    elif [ "${ALPINE_VERSION}" = "3.15" ]; then \
-      apk add --no-cache mandoc py3-pip gettext bat ; \
-      wget -q https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
-      apk add --no-cache --allow-untrusted glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
-      rm glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
-    elif [ "${ALPINE_VERSION}" = "3.17" ]; then \
-      apk add --no-cache mandoc py3-pip gettext bat ; \
-      wget -q https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
-      apk add --no-cache --allow-untrusted glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
-      rm glab_${GLAB_VERSION}_Linux_x86_64.apk ; \
-    else \
-      apk add --no-cache mdocml-apropos ; \
-      python -m pip install --upgrade pip ; \
+    apk add --no-cache mandoc py3-pip gettext && \
+    if [ "${ALPINE_VERSION}" != "3.12" ]; then \
+      apk add --no-cache bat ; \
     fi && \
     pip install requests semver && \
-    \
-    if [ "${PHP_MAJOR_VERSION}" = "7.2" ]; then \
-      echo "No libiconv to install" ; \
-    else \
-      apk add --no-cache gnu-libiconv ; \
-    fi && \
+    apk add --no-cache gnu-libiconv && \
     \
     echo "Fix sudo bug, for details see https://github.com/sudo-project/sudo/issues/42" && \
     echo "Set disable_coredump false" >> /etc/sudo.conf && \
@@ -101,6 +81,10 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     ln -sf /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
     ln -sf /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
     \
+    wget -q https://gitlab.com/gitlab-org/cli/-/releases/v${GLAB_VERSION}/downloads/glab_${GLAB_VERSION}_Linux_x86_64.apk && \
+    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/ahoy-cli/ahoy/releases/download/${AHOY_VERSION}/ahoy-bin-`uname -s`-amd64 -O /usr/local/bin/ahoy && \
     chmod +x /usr/local/bin/ahoy && \
     \