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

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !76
parents ffc3d023 154c196a
No related branches found
No related tags found
1 merge request!76Merging develop into main
Pipeline #1364878 passed
...@@ -13,21 +13,21 @@ LABEL com.example.vendor="LakeDrops" \ ...@@ -13,21 +13,21 @@ LABEL com.example.vendor="LakeDrops" \
ARG ALPINE_VERSION=undefined ARG ALPINE_VERSION=undefined
ARG PHP_MAJOR_VERSION=undefined ARG PHP_MAJOR_VERSION=undefined
ARG AHOY_VERSION=2.2.0 ARG AHOY_VERSION=2.2.0
ARG DIFFTASTIC_VERSION=0.60.0 ARG DIFFTASTIC_VERSION=0.61.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=27.3.1 ARG DOCKER_VERSION=27.3.1
ARG GIT_EXTRAS_VERSION=7.2.0 ARG GIT_EXTRAS_VERSION=7.3.0
ARG GLAB_VERSION=1.48.0 ARG GLAB_VERSION=1.50.0
ARG APK_ARCH=undefined ARG APK_ARCH=undefined
ARG buildx_version=0.17.1 ARG buildx_version=0.19.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.29.7 ARG compose_version=2.31.0
ARG composer_version=2.8.1 ARG composer_version=2.8.3
ARG DOCKER_ARCH=undefined ARG DOCKER_ARCH=undefined
ARG fx_version=35.0.0 ARG fx_version=35.0.0
ARG glibc_version=2.35-r1 ARG glibc_version=2.35-r1
ARG yq_version=4.44.3 ARG yq_version=4.44.5
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