Merge branch 'develop' into 'main'

Merging develop into main

See merge request !31

Dockerfile

@@ -20,6 +20,7 @@ ARG DOCKER_CHANNEL=stable
 ARG DOCKER_VERSION=20.10.9
 ARG GIT_EXTRAS_VERSION=6.3.0
 ARG AHOY_VERSION=2.0.0
+ARG GLAB_VERSION=1.24.1
 
 ADD usrbin/column /usr/bin/column
 ADD bin/* /usr/local/bin/
@@ -67,7 +68,10 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
     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 ; \
+      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 ; \