Skip to content

Commit

Permalink
fix java
Browse files Browse the repository at this point in the history
  • Loading branch information
ovr committed Sep 11, 2024
1 parent 728d01f commit 2a2c275
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 0 additions & 2 deletions packages/cubejs-docker/latest-debian-jdk.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ RUN yarn config set network-timeout 120000 -g
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-17-jdk-headless \
&& export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java))))) \
&& rm -rf /var/lib/apt/lists/*

# We are copying root yarn.lock file to the context folder during the Publish GH
Expand All @@ -33,7 +32,6 @@ 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-17-jre-headless python3.11 libpython3.11-dev \
&& export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java))))) \
&& rm -rf /var/lib/apt/lists/* \
&& mkdir cube \
&& chown -R cube:cube /tmp /cube /usr
Expand Down
11 changes: 5 additions & 6 deletions packages/cubejs-docker/testing-drivers.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +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-17-jre-headless unzip mc \
&& export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java))))) \
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

Expand Down Expand Up @@ -85,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
Expand Down Expand Up @@ -177,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

Expand Down

0 comments on commit 2a2c275

Please sign in to comment.