Merge pull request #656 from opencb/TASK-4289

TASK-4289 - Upgrade JVM to 8u372 in opencga Docker
opencb · Jun 21, 2023 · 5431981 · 5431981
2 parents ccf1ba8 + d7128ce
commit 5431981
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 24 deletions.
diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -10,6 +10,8 @@ on:
 jobs:
   build:
     uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop
+    with:
+      maven_opts: -DCELLBASE.WAR.NAME=cellbase
 
   test:
     uses: ./.github/workflows/test-analysis.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,6 +9,8 @@ on:
 jobs:
   build:
     uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop
+    with:
+      maven_opts: -DCELLBASE.WAR.NAME=cellbase
 
   test:
     uses: ./.github/workflows/test-analysis.yml

diff --git a/.github/workflows/task.yml b/.github/workflows/task.yml
@@ -9,6 +9,8 @@ on:
 jobs:
   build:
     uses: opencb/java-common-libs/.github/workflows/build-java-app-workflow.yml@develop
+    with:
+      maven_opts: -DCELLBASE.WAR.NAME=cellbase
 
   test:
     uses: ./.github/workflows/test-analysis.yml

diff --git a/cellbase-app/app/cloud/docker/cellbase-base/Dockerfile b/cellbase-app/app/cloud/docker/cellbase-base/Dockerfile
@@ -1,5 +1,6 @@
-## Based on Debian 11 (bullseye)
-FROM openjdk:11-jre
+## Based on Ubuntu 22.04 (jammy)
+## We are now using OpenJDK 8u372 to support "cgroup v2", see https://developers.redhat.com/articles/2023/04/19/openjdk-8u372-feature-cgroup-v2-support#
+FROM eclipse-temurin:8u372-b07-jre-jammy
 
 LABEL org.label-schema.vendor="OpenCB" \
       org.label-schema.name="cellbase-base" \

diff --git a/cellbase-app/app/cloud/docker/cellbase-base/Dockerfile.alpine b/cellbase-app/app/cloud/docker/cellbase-base/Dockerfile.alpine