Skip to content
Snippets Groups Projects

Merging develop into main

Merged jurgenhaas requested to merge develop into main
1 file
+ 2
1
Compare changes
  • Side-by-side
  • Inline
+ 4
2
@@ -20,10 +20,12 @@ ARG GIT_EXTRAS_VERSION=7.1.0
ARG GLAB_VERSION=1.36.0
ARG apkArch
ARG buildx_version=0.12.1
ARG compose_version=2.24.6
# IMPORTANT: keep the docker compose version in sync with the Ansible Docker role.
ARG compose_version=2.24.5
ARG composer_version=2.7.1
ARG dockerArch
ARG glibc_version=2.35-r1
ARG yq_version=4.42.1
ADD usrbin/column /usr/bin/column
ADD bin/* /usr/local/bin/
@@ -52,7 +54,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ && \
rm docker.tgz && \
\
if ! curl -fSL -o /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_386"; then \
if ! curl -fSL -o /usr/local/bin/yq "https://github.com/mikefarah/yq/releases/download/v${yq_version}/yq_linux_386"; then \
echo >&2 "error: failed to download 'yq'"; \
exit 1; \
fi && \
Loading