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

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !64
parents 2d67b00d a3d6ad78
No related branches found
Tags v2.2.15
1 merge request!64Merging develop into main
Pipeline #1171722 passed
......@@ -12,17 +12,18 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION
ARG compose_version=2.24.5
ARG buildx_version=0.12.1
ARG glibc_version=2.35-r1
ARG apkArch
ARG dockerArch
ARG AHOY_VERSION=2.1.1
ARG DIFFTASTIC_VERSION=0.55.0
ARG DOCKER_CHANNEL=stable
ARG DOCKER_VERSION=24.0.7
ARG GIT_EXTRAS_VERSION=7.1.0
ARG AHOY_VERSION=2.1.1
ARG GLAB_VERSION=1.36.0
ARG DIFFTASTIC_VERSION=0.55.0
ARG apkArch
ARG buildx_version=0.12.1
ARG compose_version=2.24.6
ARG composer_version=2.7.1
ARG dockerArch
ARG glibc_version=2.35-r1
ADD usrbin/column /usr/bin/column
ADD bin/* /usr/local/bin/
......@@ -85,6 +86,9 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
\
pip install wheel && \
pip install jc && \
pip install PyYaml && \
pip install python-gitlab && \
pip install visidata && \
\
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 && \
......@@ -129,7 +133,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
mv /usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini && \
sed -i -e 's/memory_limit = 128M/memory_limit = -1/g' /usr/local/etc/php/php.ini && \
\
composer selfupdate && \
composer selfupdate $composer_version && \
\
git config --global --add safe.directory '*' && \
\
......
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