Skip to content

Commit 2a04c2b

Browse files
committed
ci-base-image updated to use poetry 2.1.3 tool to eliminate virtualenv problems: pypa/virtualenv#2868 (comment)
1 parent 31de2cb commit 2a04c2b

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.gitlab-ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ variables:
1414
GIT_SUBMODULE_STRATEGY: recursive
1515
CI_DEBUG_SERVICES: "true"
1616
# pin to specific docker images for build repeatability
17-
# uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu24.04-1
18-
TEST_IMAGE_TAG: "@sha256:813f18c42929193036fc4e0017981c16913766442ef8d146313c64785df29c2e"
17+
# uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu24.04-2
18+
TEST_IMAGE_TAG: "@sha256:81f56a1820497ff3cb1342327b7242dc50270db04cbfdd8d6198af1bb0e910b3"
1919

2020
# Versions of Python packages
2121
PYTHON_JUNIT_XML_VERSION: "1.9"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Modify CI_IMAGE_TAG here and inside script hive/scripts/ci-helpers/build_ci_base_image.sh and run it. Then push images to registry
44
# To be started from cloned haf source directory.
55
ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/hive/
6-
ARG CI_IMAGE_TAG=ubuntu24.04-1
6+
ARG CI_IMAGE_TAG=ubuntu24.04-2
77
ARG BUILD_IMAGE_TAG
88
ARG IMAGE_TAG_PREFIX
99

scripts/ci-helpers/build_ci_base_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -e
44

55
REGISTRY=${1:-registry.gitlab.syncad.com/hive/hive}
6-
CI_IMAGE_TAG=ubuntu24.04-1
6+
CI_IMAGE_TAG=ubuntu24.04-2
77

88
docker build --progress=plain --target=runtime \
99
--build-arg CI_REGISTRY_IMAGE="$REGISTRY/" --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \

scripts/setup_ubuntu.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ install_user_packages() {
9999
popd
100100

101101
curl -sSL https://install.python-poetry.org | python3 - # install poetry in an isolated environment
102-
poetry self update 1.7.1
103-
poetry self add "poetry-dynamic-versioning[plugin]@>=1.0.0,<2.0.0"
102+
poetry self update 2.1.3
103+
poetry self add "poetry-dynamic-versioning[plugin]@>=1.0.0,<2.2.0"
104104
}
105105

106106
install_docker_cli() {

0 commit comments

Comments
 (0)