diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43367cf..35f19fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ stages: - code_quality_test - publish -image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.9-bookworm +image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.10-trixie variables: GIT_SUBMODULE_STRATEGY: recursive @@ -84,22 +84,22 @@ test-nix-x86_64-linux: build-posix-arm64-debug: extends: build-posix-debug tags: ["arm64"] - image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.9-bookworm-arm64 + image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.10-trixie-arm64 build-posix-arm64-release: extends: build-posix-release tags: ["arm64"] - image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.9-bookworm-arm64 + image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.10-trixie-arm64 build-clang-posix-arm64-debug: extends: build-clang-posix-debug tags: ["arm64"] - image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.9-bookworm-arm64 + image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.10-trixie-arm64 build-clang-posix-arm64-release: extends: build-clang-posix-release tags: ["arm64"] - image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.9-bookworm-arm64 + image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.10-trixie-arm64 build-posix-macos-debug: extends: build-posix-debug @@ -152,7 +152,7 @@ unit-test-posix-release: unit-test-posix-arm64: extends: unit-test-posix-debug tags: ["arm64"] - image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.9-bookworm-arm64 + image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.10-trixie-arm64 unit-test-posix-macos: stage: functional_test @@ -195,9 +195,9 @@ integration-test-posix: - echo "Waiting for uD3TN to exit gracefully - if it doesn't, check for sanitizer warnings." - wait $UD3TN_PID -integration-test-posix-python-3.13: +integration-test-posix-python-3.14: extends: integration-test-posix - image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.13-bookworm + image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.14-trixie integration-test-posix-thread-sanitizer: stage: functional_test @@ -264,7 +264,7 @@ integration-test-posix-release: integration-test-posix-arm64: extends: integration-test-posix tags: ["arm64"] - image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.9-bookworm-arm64 + image: registry.gitlab.com/d3tn/ud3tn-docker-images/ci-python-clang:3.10-trixie-arm64 integration-test-posix-macos: stage: functional_test diff --git a/test/dockerfiles/build_docker_images.sh b/test/dockerfiles/build_docker_images.sh index fffe0b7..615375e 100755 --- a/test/dockerfiles/build_docker_images.sh +++ b/test/dockerfiles/build_docker_images.sh @@ -38,13 +38,13 @@ docker build . \ docker build . \ --file test/dockerfiles/ci-python-clang \ - --build-arg IMAGE=python:3.9-bookworm \ - --tag ci-python-clang:3.9-bookworm + --build-arg IMAGE=python:3.10-trixie \ + --tag ci-python-clang:3.10-trixie docker build . \ --file test/dockerfiles/ci-python-clang \ - --build-arg IMAGE=python:3.13-bookworm \ - --tag ci-python-clang:3.13-bookworm + --build-arg IMAGE=python:3.14-trixie \ + --tag ci-python-clang:3.14-trixie echo "You may now push the images to the registry:" echo "\$ docker tag ud3tn-ion-interop: registry.gitlab.com/d3tn/ud3tn-docker-images/ion-interop:" diff --git a/test/dockerfiles/ci-python-clang b/test/dockerfiles/ci-python-clang index 959a020..355b5cd 100644 --- a/test/dockerfiles/ci-python-clang +++ b/test/dockerfiles/ci-python-clang @@ -6,7 +6,7 @@ FROM $IMAGE RUN apt-get update && \ apt-get dist-upgrade -y && \ - apt-get install -y clang clang-tidy-13 netcat-openbsd cppcheck valgrind sqlite3 libjansson-dev && \ + apt-get install -y clang clang-tidy netcat-openbsd cppcheck valgrind sqlite3 libjansson-dev && \ apt-get clean && \ rm -rf /var/lib/apt/lists/*