Skip to content

Commit 2f80c5d

Browse files
committed
Update Java JDK version
1 parent 7be3e66 commit 2f80c5d

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

ubuntu-latest/Dockerfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=Europe/Zurich && \
1616
clang-format \
1717
clang-tools \
1818
cmake \
19+
default-jdk-headless \
1920
docker.io \
2021
gcc \
2122
gcc-mingw-w64 \
@@ -41,7 +42,6 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=Europe/Zurich && \
4142
python3-jinja2 \
4243
zlib1g-dev \
4344
maven \
44-
openjdk-11-jdk \
4545
valgrind \
4646
flex bison \
4747
lsb-release software-properties-common \
@@ -58,5 +58,8 @@ RUN opam init --yes --auto-setup && opam install --confirm-level=unsafe-yes --de
5858
# install ajv for CBOM validation
5959
RUN npm -g install ajv ajv-cli
6060

61+
# set JAVA_HOME for liboqs-java builds
62+
ENV JAVA_HOME="/usr/lib/jvm/default-java"
63+
6164
# Activate if we want to test specific OpenSSL3 versions:
6265
# RUN cd /root && git clone --depth 1 --branch openssl-3.0.7 https://github.com/openssl/openssl.git && cd openssl && LDFLAGS="-Wl,-rpath -Wl,/usr/local/openssl3/lib64" ./config --prefix=/usr/local/openssl3 && make -j && make install

0 commit comments

Comments
 (0)