Skip to content

Commit

Permalink
Revert "fix: revert to older docker version (depends_on change brakes…
Browse files Browse the repository at this point in the history
… ci/cd tests?)"

This reverts commit 6af70bb.
  • Loading branch information
keskiju committed Nov 24, 2023
1 parent 6af70bb commit 91e23e9
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tools/install-docker-bin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -eux; \
apt-get -y update && \

export DOCKER_VERSION=${DOCKER_VERSION:-23.0.1} && \
export DOCKER_VERSION=${DOCKER_VERSION:-24.0.7} && \
export DOCKER_ARCH="x86_64" && \
if [ ${TARGETPLATFORM} = "linux/arm64" ]; then export DOCKER_ARCH="aarch64"; fi && \
curl -fsSL \
Expand Down
2 changes: 1 addition & 1 deletion tools/install-docker-compose.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env sh

set -eux; \
export DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:-2.17.2} && \
export DOCKER_COMPOSE_VERSION=${DOCKER_COMPOSE_VERSION:-2.23.3} && \
mkdir -p /usr/local/lib/docker/cli-plugins && \
curl -SL "/~https://github.com/docker/compose/releases/download/v$DOCKER_COMPOSE_VERSION/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/lib/docker/cli-plugins/docker-compose && \
chmod +x /usr/local/lib/docker/cli-plugins/docker-compose
2 changes: 1 addition & 1 deletion tools/install-dockerd-bin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eux; \
apt-get -qqy update && \
apt-get -qqy install iptables && \

export DOCKER_VERSION=${DOCKER_VERSION:-23.0.1} && \
export DOCKER_VERSION=${DOCKER_VERSION:-24.0.7} && \
export DOCKER_ARCH="x86_64" && \
if [ ${TARGETPLATFORM} = "linux/arm64" ]; then export DOCKER_ARCH="aarch64"; fi && \
curl -fsSL \
Expand Down

0 comments on commit 91e23e9

Please sign in to comment.