Skip to content
Snippets Groups Projects
Commit d1d5665e authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !62
parents c89157aa fd375b59
No related branches found
Tags v2.2.19
1 merge request!62Merging develop into main
Pipeline #1126275 passed
......@@ -64,8 +64,6 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
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 ; \
......@@ -85,6 +83,9 @@ 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/ && \
\
pip install wheel && \
pip install jc && \
\
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 && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment