feat(docker-jdk): Upgrade JDK to 17 from 11

fix java
cube-js · Sep 12, 2024 · c3a1ccd · c3a1ccd
1 parent 97159e7
commit c3a1ccd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/packages/cubejs-docker/dev.Dockerfile b/packages/cubejs-docker/dev.Dockerfile
@@ -9,7 +9,7 @@ ENV CI=0
 RUN DEBIAN_FRONTEND=noninteractive \
     && apt-get update \
     && apt-get install -y --no-install-recommends rxvt-unicode libssl3 curl \
-       cmake python3.11 libpython3.11-dev gcc g++ make cmake openjdk-11-jdk-headless \
+       cmake python3.11 libpython3.11-dev gcc g++ make cmake openjdk-17-jdk-headless \
     && rm -rf /var/lib/apt/lists/*
 
 ENV RUSTUP_HOME=/usr/local/rustup

diff --git a/packages/cubejs-docker/latest-debian-jdk.Dockerfile b/packages/cubejs-docker/latest-debian-jdk.Dockerfile
@@ -11,7 +11,7 @@ RUN yarn config set network-timeout 120000 -g
 # Required for node-oracledb to buld on ARM64
 RUN apt-get update \
     # libpython3-dev is needed to trigger post-installer to download native with python
-    && apt-get install -y python3.11 libpython3.11-dev gcc g++ make cmake openjdk-11-jdk-headless \
+    && apt-get install -y python3.11 libpython3.11-dev gcc g++ make cmake openjdk-17-jdk-headless \
     && rm -rf /var/lib/apt/lists/*
 
 # We are copying root yarn.lock file to the context folder during the Publish GH
@@ -31,7 +31,7 @@ ENV CUBEJS_DOCKER_IMAGE_TAG=latest
 RUN groupadd cube && useradd -ms /bin/bash -g cube cube \
     && DEBIAN_FRONTEND=noninteractive \
     && apt-get update \
-    && apt-get install -y --no-install-recommends rxvt-unicode libssl3 openjdk-11-jdk-headless python3.11 libpython3.11-dev \
+    && apt-get install -y --no-install-recommends rxvt-unicode libssl3 openjdk-17-jre-headless python3.11 libpython3.11-dev \
     && rm -rf /var/lib/apt/lists/* \
     && mkdir cube \
     && chown -R cube:cube /tmp /cube /usr

diff --git a/packages/cubejs-docker/latest.Dockerfile b/packages/cubejs-docker/latest.Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-bookworm-slim as builder
+FROM node:20.17.0-bookworm-slim AS builder
 
 WORKDIR /cube
 COPY . .
@@ -34,15 +34,15 @@ RUN DEBIAN_FRONTEND=noninteractive \
 
 RUN yarn policies set-version v1.22.19
 
-ENV TERM rxvt-unicode
-ENV NODE_ENV production
+ENV TERM=rxvt-unicode
+ENV NODE_ENV=production
 
 WORKDIR /cube
 
 COPY --from=builder /cube .
 
 # By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more
-ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules
+ENV NODE_PATH=/cube/conf/node_modules:/cube/node_modules
 ENV PYTHONUNBUFFERED=1
 RUN ln -s /cube/node_modules/.bin/cubejs /usr/local/bin/cubejs
 RUN ln -s /cube/node_modules/.bin/cubestore-dev /usr/local/bin/cubestore-dev

diff --git a/packages/cubejs-docker/testing-drivers.Dockerfile b/packages/cubejs-docker/testing-drivers.Dockerfile
@@ -13,12 +13,12 @@ ENV CI=0
 RUN DEBIAN_FRONTEND=noninteractive \
     && apt-get update \
     && apt-get install -y --no-install-recommends rxvt-unicode libssl3 curl \
-       cmake python3 gcc g++ make cmake openjdk-11-jdk-headless unzip mc \
+       cmake python3 gcc g++ make cmake openjdk-17-jdk-headless unzip \
     && rm -rf /var/lib/apt/lists/*
 
 ENV CUBESTORE_SKIP_POST_INSTALL=true
-ENV TERM rxvt-unicode
-ENV NODE_ENV development
+ENV TERM=rxvt-unicode
+ENV NODE_ENV=development
 
 WORKDIR /cubejs
 
@@ -84,7 +84,7 @@ RUN yarn config set network-timeout 120000 -g
 ######################################################################
 # Databricks driver dependencies                                     #
 ######################################################################
-FROM base as prod_base_dependencies
+FROM base AS prod_base_dependencies
 COPY packages/cubejs-databricks-jdbc-driver/package.json packages/cubejs-databricks-jdbc-driver/package.json
 RUN mkdir packages/cubejs-databricks-jdbc-driver/bin
 RUN echo '#!/usr/bin/env node' > packages/cubejs-databricks-jdbc-driver/bin/post-install
@@ -176,7 +176,7 @@ COPY --from=prod_dependencies /cubejs .
 COPY packages/cubejs-docker/bin/cubejs-dev /usr/local/bin/cubejs
 
 # By default Node dont search in parent directory from /cube/conf, @todo Reaserch a little bit more
-ENV NODE_PATH /cube/conf/node_modules:/cube/node_modules
+ENV NODE_PATH=/cube/conf/node_modules:/cube/node_modules
 RUN ln -s  /cubejs/packages/cubejs-docker /cube
 RUN ln -s  /cubejs/rust/cubestore/bin/cubestore-dev /usr/local/bin/cubestore-dev