From 2cff96987da20a97245a8a3b00b94fdc810ecac3 Mon Sep 17 00:00:00 2001 From: Peter Somogyvari Date: Tue, 27 Jun 2023 00:50:57 +0000 Subject: [PATCH] build(tools): bump DinD base images - fix cgroup v2 sed: write error Bump the versions across the board so that all our test container images are fixed. Once this is merged, we can start upgrading the images that the test cases are using (for now they remain pinned to the previous, buggy images) Fixes #2518 Signed-off-by: Peter Somogyvari --- tools/docker/besu-multi-party-all-in-one/Dockerfile | 2 +- tools/docker/corda-all-in-one/Dockerfile | 2 +- tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile | 2 +- tools/docker/corda-all-in-one/corda-v4_8/Dockerfile | 2 +- tools/docker/iroha2-all-in-one/Dockerfile | 2 +- tools/docker/quorum-multi-party-all-in-one/Dockerfile | 2 +- tools/docker/sawtooth-all-in-one/Dockerfile | 2 +- tools/docker/supabase-all-in-one/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/docker/besu-multi-party-all-in-one/Dockerfile b/tools/docker/besu-multi-party-all-in-one/Dockerfile index 1989531802..60c6ef1de1 100644 --- a/tools/docker/besu-multi-party-all-in-one/Dockerfile +++ b/tools/docker/besu-multi-party-all-in-one/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:20.10.3-dind +FROM docker:24.0.2-dind ARG BESU_VERSION=21.1.2 ARG QUORUM_VERSION=21.4.1 diff --git a/tools/docker/corda-all-in-one/Dockerfile b/tools/docker/corda-all-in-one/Dockerfile index 916897d459..f9a89d8e06 100644 --- a/tools/docker/corda-all-in-one/Dockerfile +++ b/tools/docker/corda-all-in-one/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:20.10.2-dind +FROM docker:24.0.2-dind ARG SAMPLES_KOTLIN_SHA=30fd841dd035934bae75ab8910da3b6e3d5d6ee7 ARG SAMPLES_KOTLIN_CORDAPP_SUB_DIR_PATH="./Advanced/obligation-cordapp/" diff --git a/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile b/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile index 698c55bbcc..41245c93f5 100644 --- a/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile +++ b/tools/docker/corda-all-in-one/corda-v4_8-flowdb/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:20.10.2-dind +FROM docker:24.0.2-dind ARG SAMPLES_KOTLIN_SHA=30fd841dd035934bae75ab8910da3b6e3d5d6ee7 ARG SAMPLES_KOTLIN_FLOWDB_SUB_DIR_PATH="./Basic/flow-database-access/" diff --git a/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile b/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile index 549f1bb274..b31b07c9d0 100644 --- a/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile +++ b/tools/docker/corda-all-in-one/corda-v4_8/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:20.10.2-dind +FROM docker:24.0.2-dind # cordaVersion=4.8.5 # cordaCoreVersion=4.8.5 diff --git a/tools/docker/iroha2-all-in-one/Dockerfile b/tools/docker/iroha2-all-in-one/Dockerfile index 0e6b69f9ef..3b872a7d02 100644 --- a/tools/docker/iroha2-all-in-one/Dockerfile +++ b/tools/docker/iroha2-all-in-one/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:20.10.21-dind +FROM docker:24.0.2-dind ENV APP_ROOT="/app" ENV FREEZE_TMP_DIR="/opt/docker-freeze" diff --git a/tools/docker/quorum-multi-party-all-in-one/Dockerfile b/tools/docker/quorum-multi-party-all-in-one/Dockerfile index 323cb8a322..3a07c43294 100644 --- a/tools/docker/quorum-multi-party-all-in-one/Dockerfile +++ b/tools/docker/quorum-multi-party-all-in-one/Dockerfile @@ -17,7 +17,7 @@ RUN quorum-dev-quickstart --clientType goquorum --outputPath ./ --monitoring def # docker-compose base ################################ -FROM docker:20.10.21-dind +FROM docker:24.0.2-dind ENV ROOT_DIR=/opt/quorum-dev-quickstart diff --git a/tools/docker/sawtooth-all-in-one/Dockerfile b/tools/docker/sawtooth-all-in-one/Dockerfile index 1feec739f8..fba9e761aa 100644 --- a/tools/docker/sawtooth-all-in-one/Dockerfile +++ b/tools/docker/sawtooth-all-in-one/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:20.10.17-dind +FROM docker:24.0.2-dind # Install docker-compose and it's dependencies RUN apk update \ diff --git a/tools/docker/supabase-all-in-one/Dockerfile b/tools/docker/supabase-all-in-one/Dockerfile index 1e9b24984d..56a757acc1 100644 --- a/tools/docker/supabase-all-in-one/Dockerfile +++ b/tools/docker/supabase-all-in-one/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:20.10.21-dind +FROM docker:24.0.2-dind ARG SUPABSE_TAG="v0.22.10"