From 6dbc6ccdd6a6e1c27a877bfd9f9ab2ed977f647a Mon Sep 17 00:00:00 2001
From: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Date: Wed, 13 Dec 2023 20:38:10 +0100
Subject: [PATCH] Fix CI for new ci image (#2701)

cc https://github.com/paritytech/ci_cd/issues/910
---
 .gitlab-ci.yml                                                  | 2 +-
 docker/dockerfiles/collator_injected.Dockerfile                 | 2 +-
 docker/dockerfiles/malus_injected.Dockerfile                    | 2 +-
 .../polkadot-parachain-debug_unsigned_injected.Dockerfile       | 2 +-
 docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile  | 2 +-
 .../dockerfiles/polkadot/polkadot_injected_release.Dockerfile   | 2 +-
 docker/dockerfiles/substrate_injected.Dockerfile                | 2 +-
 docker/dockerfiles/test-parachain_injected.Dockerfile           | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 67569d974124..90fabb441fd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ workflow:
 variables:
   # CI_IMAGE: !reference [.ci-unified, variables, CI_IMAGE]
   # REMOVE ME, for tests
-  CI_IMAGE: "paritypr/ci-unified:616-af90bf09-bookworm-1.74.0"
+  CI_IMAGE: "paritypr/ci-unified:616-d77d9ad3-bookworm-1.74.0"
   # BUILDAH_IMAGE is defined in group variables
   BUILDAH_COMMAND: "buildah --storage-driver overlay2"
   RELENG_SCRIPTS_BRANCH: "master"
diff --git a/docker/dockerfiles/collator_injected.Dockerfile b/docker/dockerfiles/collator_injected.Dockerfile
index 999203b93f0a..9e7f87e8ad35 100644
--- a/docker/dockerfiles/collator_injected.Dockerfile
+++ b/docker/dockerfiles/collator_injected.Dockerfile
@@ -1,5 +1,5 @@
 # this file copies from scripts/ci/dockerfiles/Dockerfile and changes only the binary name
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:22.04
 
 # metadata
 ARG VCS_REF
diff --git a/docker/dockerfiles/malus_injected.Dockerfile b/docker/dockerfiles/malus_injected.Dockerfile
index dd8702ea101b..0b68b1419f8b 100644
--- a/docker/dockerfiles/malus_injected.Dockerfile
+++ b/docker/dockerfiles/malus_injected.Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:bookworm-20231120-slim
 
 # metadata
 ARG VCS_REF
diff --git a/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile b/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
index f249612e7764..8ee0395d7080 100644
--- a/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
+++ b/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:22.04
 
 # metadata
 ARG VCS_REF
diff --git a/docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile b/docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
index 55d23f3a8052..a8f305c33ca7 100644
--- a/docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
+++ b/docker/dockerfiles/polkadot/polkadot_injected_debug.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:22.04
 
 # metadata
 ARG VCS_REF
diff --git a/docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile b/docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile
index 2632968f8a2b..2f7c1b01f83f 100644
--- a/docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile
+++ b/docker/dockerfiles/polkadot/polkadot_injected_release.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:22.04
 
 # metadata
 ARG VCS_REF
diff --git a/docker/dockerfiles/substrate_injected.Dockerfile b/docker/dockerfiles/substrate_injected.Dockerfile
index 47a917013a8b..b4db9a76e2ea 100644
--- a/docker/dockerfiles/substrate_injected.Dockerfile
+++ b/docker/dockerfiles/substrate_injected.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:22.04
 
 # metadata
 ARG VCS_REF
diff --git a/docker/dockerfiles/test-parachain_injected.Dockerfile b/docker/dockerfiles/test-parachain_injected.Dockerfile
index 317312a18bf1..ebe80485c238 100644
--- a/docker/dockerfiles/test-parachain_injected.Dockerfile
+++ b/docker/dockerfiles/test-parachain_injected.Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/ubuntu:20.04
+FROM docker.io/library/ubuntu:22.04
 
 # metadata
 ARG VCS_REF