From 6993deeb250b7e62325f90402f8f9669f88cafba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mateusz=20=C5=BBebrak?= <mzebrak@syncad.com>
Date: Fri, 22 Sep 2023 14:10:39 +0200
Subject: [PATCH] Include the poetry-dynamic-versioning plugin in ci base image

---
 .gitlab-ci.yaml                           | 4 ++--
 Dockerfile                                | 2 +-
 scripts/ci-helpers/build_ci_base_image.sh | 2 +-
 scripts/setup_ubuntu.sh                   | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
index f12e214ac8..534d210d9a 100644
--- a/.gitlab-ci.yaml
+++ b/.gitlab-ci.yaml
@@ -13,8 +13,8 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
   CI_DEBUG_SERVICES: "true"
   # pin to specific docker images for build repeatability
-  # uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-6
-  TEST_IMAGE_TAG: "@sha256:8132802ca3b7ddba1bf78e4cc5ce1fbda6874cb029e35ae855c4cb3443e477b7"
+  # uses registry.gitlab.syncad.com/hive/hive/ci-base-image:ubuntu22.04-7
+  TEST_IMAGE_TAG: "@sha256:8f68baf07c6e581e1e8034a1447c4ff1268239fc886bfe4b02aa3f4182bf78bb"
 
   # Versions of Python packages
   PYTHON_JUNIT_XML_VERSION: "1.9"
diff --git a/Dockerfile b/Dockerfile
index 7ae86b06b8..f097733103 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@
 # Modify CI_IMAGE_TAG here and inside script hive/scripts/ci-helpers/build_ci_base_images.sh and run it. Then push images to registry
 # To be started from cloned haf source directory.
 ARG CI_REGISTRY_IMAGE=registry.gitlab.syncad.com/hive/hive/
-ARG CI_IMAGE_TAG=:ubuntu22.04-6
+ARG CI_IMAGE_TAG=:ubuntu22.04-7
 ARG BUILD_IMAGE_TAG
 
 FROM phusion/baseimage:jammy-1.0.1 AS runtime
diff --git a/scripts/ci-helpers/build_ci_base_image.sh b/scripts/ci-helpers/build_ci_base_image.sh
index 81258bd7b0..1c10f99398 100755
--- a/scripts/ci-helpers/build_ci_base_image.sh
+++ b/scripts/ci-helpers/build_ci_base_image.sh
@@ -1,7 +1,7 @@
 #! /bin/bash
 
 REGISTRY=${1:-registry.gitlab.syncad.com/hive/hive/}
-CI_IMAGE_TAG=:ubuntu22.04-6
+CI_IMAGE_TAG=:ubuntu22.04-7
 
 docker buildx build --progress=plain --target=runtime \
   --build-arg CI_REGISTRY_IMAGE=$REGISTRY --build-arg CI_IMAGE_TAG=$CI_IMAGE_TAG \
diff --git a/scripts/setup_ubuntu.sh b/scripts/setup_ubuntu.sh
index 744df7441e..c3e7fbbb86 100755
--- a/scripts/setup_ubuntu.sh
+++ b/scripts/setup_ubuntu.sh
@@ -88,6 +88,7 @@ install_user_packages() {
 
   curl -sSL https://install.python-poetry.org | python3 -  # install poetry in an isolated environment
   poetry self update 1.5.1
+  poetry self add "poetry-dynamic-versioning[plugin]@>=1.0.0,<2.0.0"
 }
 
 create_hived_admin_account() {