Skip to content
Snippets Groups Projects

Merging develop into main

Merged jurgenhaas requested to merge develop into main
1 file
+ 12
8
Compare changes
  • Side-by-side
  • Inline
+ 12
8
@@ -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 '*' && \
\
Loading