From 2bcdc1ee3711fd8f1fea14cb075f2e7d7612c4b1 Mon Sep 17 00:00:00 2001 From: Hiroshi Miura Date: Thu, 13 Jun 2024 12:29:36 +0900 Subject: [PATCH] chore: bump jdk 11.0.23+9 for test-integ also - update Gradle@8.8 for test-integ - ca certificates@1.0.3-1 - compose to specify openjdk@17.0.11.0.0+9 Signed-off-by: Hiroshi Miura --- compose.yml | 4 ++-- test-integration/docker/client/Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compose.yml b/compose.yml index da7732afc2..ec1016da91 100644 --- a/compose.yml +++ b/compose.yml @@ -16,8 +16,8 @@ services: context: test-integration/docker/client args: JAVA: 17 - JDKVER: jdk_17.0.8.1.0+1 - GRADLE: 8.4 + JDKVER: jdk_17.0.11.0.0+9 + GRADLE: 8.8 depends_on: - server volumes: diff --git a/test-integration/docker/client/Dockerfile b/test-integration/docker/client/Dockerfile index f4ea1f1ad8..251ff66f42 100644 --- a/test-integration/docker/client/Dockerfile +++ b/test-integration/docker/client/Dockerfile @@ -3,7 +3,7 @@ # with fuzzy matching, translation memory, keyword search, # glossaries, and translation leveraging into updated projects. # -# Copyright (C) 2022,2023 Hiroshi Miura +# Copyright (C) 2022-2024 Hiroshi Miura # Home page: https://www.omegat.org/ # Support center: https://omegat.org/support # @@ -24,13 +24,13 @@ # **************************************************************************/ # -FROM debian:bullseye-slim +FROM debian:bookworm-slim ARG CAVER=1.0.3-1 ARG JAVA=11 ARG JDKVER=jdk_11.0.23.0.0+9 ARG GRADLE=8.8 RUN apt-get -y update && apt-get upgrade -y && apt-get install -y openssh-client git inotify-tools curl subversion unzip rsync \ - java-common libasound2 libfontconfig1 libfreetype6 libxi6 libxrender1 libxtst6 p11-kit opendjdk-17-jdk + java-common libasound2 libfontconfig1 libfreetype6 libxi6 libxrender1 libxtst6 p11-kit openjdk-17-jdk RUN adduser --disabled-password --gecos "" --home /home/omegat --shell /bin/bash omegat && mkdir -p /home/omegat/.ssh RUN chown -R omegat.omegat /home/omegat COPY --chown=omegat ssh_config /home/omegat/.ssh/config