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

Updates:

- docker compose 2.24.6
- composer 2.7.1
- JC 1.25.1
- Git 2.44.0
parent d2ba1e4d
No related branches found
Tags v2.2.24
1 merge request!64Merging develop into main
...@@ -12,17 +12,18 @@ LABEL com.example.vendor="LakeDrops" \ ...@@ -12,17 +12,18 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION ARG PHP_MAJOR_VERSION
ARG compose_version=2.24.5 ARG AHOY_VERSION=2.1.1
ARG buildx_version=0.12.1 ARG DIFFTASTIC_VERSION=0.55.0
ARG glibc_version=2.35-r1
ARG apkArch
ARG dockerArch
ARG DOCKER_CHANNEL=stable ARG DOCKER_CHANNEL=stable
ARG DOCKER_VERSION=24.0.7 ARG DOCKER_VERSION=24.0.7
ARG GIT_EXTRAS_VERSION=7.1.0 ARG GIT_EXTRAS_VERSION=7.1.0
ARG AHOY_VERSION=2.1.1
ARG GLAB_VERSION=1.36.0 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 usrbin/column /usr/bin/column
ADD bin/* /usr/local/bin/ ADD bin/* /usr/local/bin/
...@@ -132,7 +133,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \ ...@@ -132,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 && \ 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 && \ 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 '*' && \ 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