From 8a155ef31318d7a6d972e78ae1c4834a7b209341 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 13 Dec 2023 14:11:40 +0100 Subject: [PATCH 1/3] Fix CI for new ci image --- 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 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docker/dockerfiles/collator_injected.Dockerfile b/docker/dockerfiles/collator_injected.Dockerfile index 999203b93f0ac..9e7f87e8ad35c 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 dd8702ea101b5..0b68b1419f8b4 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 f249612e77641..8ee0395d70801 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 55d23f3a80529..a8f305c33ca7a 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 2632968f8a2b0..2f7c1b01f83f1 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 47a917013a8b5..b4db9a76e2eaf 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 317312a18bf14..ebe80485c238f 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 From a8dd3d65b64ffa53a0a72b04780688b5347a9626 Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 13 Dec 2023 15:29:24 +0100 Subject: [PATCH 2/3] ci image with xq --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67569d9741242..29d8a73c3c5e7 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-1c97bfc2-bookworm-1.74.0" # BUILDAH_IMAGE is defined in group variables BUILDAH_COMMAND: "buildah --storage-driver overlay2" RELENG_SCRIPTS_BRANCH: "master" From d976903146969478aefaf3d0ce17c814f3646bcf Mon Sep 17 00:00:00 2001 From: alvicsam Date: Wed, 13 Dec 2023 16:57:20 +0100 Subject: [PATCH 3/3] ci image with updated xq --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29d8a73c3c5e7..90fabb441fd56 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-1c97bfc2-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"