From b6c5dadb6151ecb9dcc1dc333d3d42e84e2c67a0 Mon Sep 17 00:00:00 2001 From: "John N. Milner" Date: Thu, 15 Jun 2023 12:09:19 -0400 Subject: [PATCH 1/3] Upgrade OpenJDK for Debian 12 python:3.10 base image now includes openjdk-17-jre; version 11 is removed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 30e02f6aa..0e9de3977 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,7 +62,7 @@ RUN apt-get -qq update && \ libproj-dev \ libsqlite3-mod-spatialite \ locales \ - openjdk-11-jre \ + openjdk-17-jre \ postgresql-client \ procps \ rsync \ From 8370eafd8842dd8a8bd8ff47d7db86200f1dec1f Mon Sep 17 00:00:00 2001 From: "John N. Milner" Date: Mon, 26 Jun 2023 11:48:13 -0400 Subject: [PATCH 2/3] Update to OpenJDK 17 in GitLab CI config --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e769cf484..e37c62d40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ test: - name: redis:6.2 alias: redis_cache script: - - apt-get update && apt-get install -y ghostscript gdal-bin libproj-dev gettext openjdk-11-jre + - apt-get update && apt-get install -y ghostscript gdal-bin libproj-dev gettext openjdk-17-jre - pip install -r dependencies/pip/dev_requirements.txt - pytest -vv -rf From 50b6a12b3a881ea065a63b334425214a86059b75 Mon Sep 17 00:00:00 2001 From: David Burke Date: Wed, 5 Jul 2023 21:12:25 -0400 Subject: [PATCH 3/3] Install openjdk first as a workaround --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0e9de3977..ed2e043b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,6 +51,7 @@ RUN mkdir -p ${NGINX_STATIC_DIR} && \ # jnm (or the current on-call sysadmin). Thanks. RUN apt-get -qq update && \ + apt-get -qq -y install openjdk-17-jre && \ apt-get -qq -y install \ cron \ gdal-bin \ @@ -62,7 +63,6 @@ RUN apt-get -qq update && \ libproj-dev \ libsqlite3-mod-spatialite \ locales \ - openjdk-17-jre \ postgresql-client \ procps \ rsync \