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

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !72
parents 2f08f765 6986debc
No related branches found
No related tags found
1 merge request!72Merging develop into main
Pipeline #1251078 passed
...@@ -16,18 +16,18 @@ ARG AHOY_VERSION=2.1.1 ...@@ -16,18 +16,18 @@ ARG AHOY_VERSION=2.1.1
ARG DIFFTASTIC_VERSION=0.58.0 ARG DIFFTASTIC_VERSION=0.58.0
ARG DOCKER_CHANNEL=stable ARG DOCKER_CHANNEL=stable
# Check for latest at https://download.docker.com/linux/static/stable/x86_64/ # Check for latest at https://download.docker.com/linux/static/stable/x86_64/
ARG DOCKER_VERSION=26.1.2 ARG DOCKER_VERSION=26.1.4
ARG GIT_EXTRAS_VERSION=7.2.0 ARG GIT_EXTRAS_VERSION=7.2.0
ARG GLAB_VERSION=1.41.0 ARG GLAB_VERSION=1.42.0
ARG apkArch ARG apkArch
ARG buildx_version=0.14.1 ARG buildx_version=0.15.1
# IMPORTANT: keep the docker compose version in sync with the Ansible Docker role. # IMPORTANT: keep the docker compose version in sync with the Ansible Docker role.
ARG compose_version=2.27.1 ARG compose_version=2.27.3
ARG composer_version=2.7.7 ARG composer_version=2.7.7
ARG dockerArch ARG dockerArch
ARG fx_version=34.0.0 ARG fx_version=34.0.0
ARG glibc_version=2.35-r1 ARG glibc_version=2.35-r1
ARG yq_version=4.44.1 ARG yq_version=4.44.2
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.
Please register or to comment