diff --git a/Dockerfile b/Dockerfile index 3ea5f71427adf406c73090b6da98f6fc5f74ae70..4e69c861aa9fde8fe9dc0391cf9cce2ca9681ecc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 && \ diff --git a/bin/backstop b/bin/backstop index 644910363554345710899ee426cef7ce17b9c333..a7387a5736d2df6402cd94f465a14b8bd4458713 100755 --- a/bin/backstop +++ b/bin/backstop @@ -1,5 +1,6 @@ #!/bin/bash +docker pull backstopjs/backstopjs --quiet export $(cat .env | xargs) cd tests/backstop ./backstop-script-before