From 1411c7cf749daea3e2acdf4ab566226d188086dd Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Mon, 16 Dec 2024 13:02:50 +0100 Subject: [PATCH 1/3] Script/Images: upgrade [python] version to 3.12.8 --- scripts/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/version.sh b/scripts/version.sh index f46926775288..48ba39d07bac 100644 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -56,7 +56,7 @@ export cargo_version='1.77.2' export opam_version='2.3.0' # Installed via apk python3-dev -export python_version='3.12.7' +export python_version='3.12.8' # Installed via apk export poetry_version='1.8.3' -- GitLab From 88fc2d4ed6517522a402ad0f4b501b71c712817d Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Mon, 16 Dec 2024 13:49:25 +0100 Subject: [PATCH 2/3] Images/CI: add [scripts/version.sh] in [inputs] If some value in [version.sh] is modified, then the CI images should most likely be rebuilt. The rebuild of Docker images is parameterised by the hash of files listed in [images/ci/inputs]. If any of the files listed changes, then the hash will change and the CI jobs [oc.docker:ci:] will rebuild the images. Adding [scripts/version.sh] in [inputs] will thus trigger the rebuilt when any of the values hardcoded in [version.sh] changes. --- images/ci/inputs | 1 + 1 file changed, 1 insertion(+) diff --git a/images/ci/inputs b/images/ci/inputs index 53a230536356..90ba4fbafaa7 100644 --- a/images/ci/inputs +++ b/images/ci/inputs @@ -6,3 +6,4 @@ poetry.lock opam/virtual/octez-deps.opam.locked images/common/install-nvm.sh scripts/install_dal_trusted_setup.sh +scripts/version.sh -- GitLab From 1ae636adf0dc1cb01b92f06a149c6a91f4dc3497 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Mon, 16 Dec 2024 14:09:35 +0100 Subject: [PATCH 3/3] Images/CI: force update of Alpine package list in [CI.runtime] We have noticed then when rebuilding [CI.runtime] images, the latest version of alpine packages was not used. This is probably because a cached version of the layers is used by [docker build]. Cf. e.g https://gitlab.com/tezos/tezos/-/jobs/8653365791#L106 To circumvent this we add the [apk upate] instructions when adding packages in [CI.runtime]. Another possibility would have been to modify [create_ci_images.sh] by using the [--no-cache] option in the call of [docker build], but this may involve unnecessary recomputations. --- images/ci/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/ci/Dockerfile b/images/ci/Dockerfile index f6d5338a8279..01ef4984f8b8 100644 --- a/images/ci/Dockerfile +++ b/images/ci/Dockerfile @@ -49,7 +49,8 @@ RUN echo 'tezos:x:1000:tezos' >> /etc/group \ COPY ./zcash-params/sapling-output.params ./zcash-params/sapling-spend.params /usr/share/zcash-params/ # hadolint ignore=DL3018 -RUN apk --no-cache add \ +RUN apk update \ + && apk add --no-cache \ binutils \ gcc \ gmp \ -- GitLab