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

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !63
parents d1d5665e 33197570
No related branches found
Tags v2.2.24
1 merge request!63Merging develop into main
Pipeline #1156071 passed
...@@ -12,8 +12,8 @@ LABEL com.example.vendor="LakeDrops" \ ...@@ -12,8 +12,8 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION ARG ALPINE_VERSION
ARG PHP_MAJOR_VERSION ARG PHP_MAJOR_VERSION
ARG compose_version=2.23.3 ARG compose_version=2.24.5
ARG buildx_version=0.12.0 ARG buildx_version=0.12.1
ARG glibc_version=2.35-r1 ARG glibc_version=2.35-r1
ARG apkArch ARG apkArch
ARG dockerArch ARG dockerArch
...@@ -22,7 +22,7 @@ ARG DOCKER_VERSION=24.0.7 ...@@ -22,7 +22,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 AHOY_VERSION=2.1.1
ARG GLAB_VERSION=1.36.0 ARG GLAB_VERSION=1.36.0
ARG DIFFTASTIC_VERSION=0.53.1 ARG DIFFTASTIC_VERSION=0.55.0
ADD usrbin/column /usr/bin/column ADD usrbin/column /usr/bin/column
ADD bin/* /usr/local/bin/ ADD bin/* /usr/local/bin/
......
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