From 1e8c4531dc978311c2cfcb249fab53fc377a8b35 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Fri, 12 May 2023 09:40:14 +0300 Subject: [PATCH 1/3] update java for cli images #2201 --- .github/workflows/build-and-run-tests.yml | 3 ++- utbot-cli-js/Dockerfile | 2 +- utbot-cli-python/Dockerfile | 2 +- utbot-cli/Dockerfile | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-run-tests.yml b/.github/workflows/build-and-run-tests.yml index d3e8e68ba4..5d71c96b78 100644 --- a/.github/workflows/build-and-run-tests.yml +++ b/.github/workflows/build-and-run-tests.yml @@ -28,7 +28,8 @@ jobs: publish-cli-image: needs: build-and-run-tests - if: ${{ github.event_name == 'push' }} +# temporary commented to check images +# if: ${{ github.event_name == 'push' }} strategy: fail-fast: false # force to execute all jobs even though some of them have failed matrix: diff --git a/utbot-cli-js/Dockerfile b/utbot-cli-js/Dockerfile index 6eb099837d..0e94a8ca7b 100644 --- a/utbot-cli-js/Dockerfile +++ b/utbot-cli-js/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk:11.0.15-11.56.19 +FROM azul/zulu-openjdk:17.0.7-17.42.19 ARG DEBIAN_FRONTEND=noninteractive diff --git a/utbot-cli-python/Dockerfile b/utbot-cli-python/Dockerfile index 6a76e29d21..4c5a8fd5da 100644 --- a/utbot-cli-python/Dockerfile +++ b/utbot-cli-python/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk:11.0.15-11.56.19 +FROM azul/zulu-openjdk:17.0.7-17.42.19 ARG DEBIAN_FRONTEND=noninteractive diff --git a/utbot-cli/Dockerfile b/utbot-cli/Dockerfile index 9e4e97e1b8..539a83b505 100644 --- a/utbot-cli/Dockerfile +++ b/utbot-cli/Dockerfile @@ -1,4 +1,4 @@ -FROM azul/zulu-openjdk:11.0.15-11.56.19 +FROM azul/zulu-openjdk:17.0.7-17.42.19 ARG DEBIAN_FRONTEND=noninteractive From 2525bc3ef609af5a6094ff0be03d07eb2245a4f8 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Fri, 12 May 2023 15:36:04 +0300 Subject: [PATCH 2/3] fix python commands --- utbot-cli-python/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utbot-cli-python/Dockerfile b/utbot-cli-python/Dockerfile index 4c5a8fd5da..62b7252ce8 100644 --- a/utbot-cli-python/Dockerfile +++ b/utbot-cli-python/Dockerfile @@ -8,10 +8,10 @@ RUN apt-get update \ && apt-get install -y -q --no-install-recommends \ curl \ python3.9 \ - python3.9-distutils \ + python3-distutils \ && rm -rf /var/lib/apt/lists/* \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ - && python3.9 get-pip.py \ + && python3 get-pip.py \ && pip install -U \ pytest From 39c79542285f7eaf6ab1fcc6753be021d56383f1 Mon Sep 17 00:00:00 2001 From: Egor Vasilyev Date: Wed, 17 May 2023 15:12:22 +0300 Subject: [PATCH 3/3] install specified python version --- utbot-cli-python/Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/utbot-cli-python/Dockerfile b/utbot-cli-python/Dockerfile index 62b7252ce8..2765f9a021 100644 --- a/utbot-cli-python/Dockerfile +++ b/utbot-cli-python/Dockerfile @@ -7,8 +7,15 @@ WORKDIR /usr/src/ RUN apt-get update \ && apt-get install -y -q --no-install-recommends \ curl \ - python3.9 \ + gpg-agent \ + software-properties-common \ + && add-apt-repository -y ppa:deadsnakes/ppa \ + && apt-get update \ + && apt-get install -y -q --no-install-recommends \ + python3.10 \ python3-distutils \ + && rm /usr/bin/python3 \ + && ln -s /usr/bin/python3.10 /usr/bin/python3 \ && rm -rf /var/lib/apt/lists/* \ && curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python3 get-pip.py \