From 18ae2d8138e06fc10322ac14e324d11a4836d28e Mon Sep 17 00:00:00 2001 From: Anton Baliasnikov Date: Mon, 23 Oct 2023 15:18:23 +0100 Subject: [PATCH] ci: use jdk 22 docker test image --- .github/docker/Dockerfile | 12 +++++++----- .github/workflows/unit-tests-common.yml | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/docker/Dockerfile b/.github/docker/Dockerfile index 0966ec3fb9..3b363f384a 100644 --- a/.github/docker/Dockerfile +++ b/.github/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM openjdk:22-jdk-slim RUN apt-get update && \ apt-get install --no-install-recommends --yes \ @@ -8,10 +8,10 @@ RUN apt-get update && \ unzip=6.* \ zip=3.* \ jq=1.* \ - python3=3.10.* \ - python3-pip=22.* \ - python3-setuptools=59.6.* \ - python3-wheel=0.37.* \ + python3=3.11.* \ + python3-pip=23.* \ + python3-setuptools=66.* \ + python3-wheel=0.38.* \ gnupg=2.2.* \ default-jre=2:1.* \ build-essential=12.* && \ @@ -23,3 +23,5 @@ RUN apt-get update && \ apt-get install --no-install-recommends --yes \ sbt=1.4.* \ && rm -rf /var/lib/apt/lists/* + +CMD [ "/bin/bash" ] diff --git a/.github/workflows/unit-tests-common.yml b/.github/workflows/unit-tests-common.yml index 8f02e5b22d..26c0ec134d 100644 --- a/.github/workflows/unit-tests-common.yml +++ b/.github/workflows/unit-tests-common.yml @@ -19,7 +19,7 @@ jobs: name: "Build and unit tests for ${{ inputs.component-name }}" runs-on: self-hosted container: - image: ghcr.io/input-output-hk/agent-ci-ubuntu-22-jdk-11:0.1.0 + image: ghcr.io/hyperledger-labs/ci-debian-jdk-22:0.1.0 volumes: - /nix:/nix credentials: