Skip to content

Commit 4e069c6

Browse files
committed
Update Java JDK version
Signed-off-by: Spencer Wilson <spencer.wilson@uwaterloo.ca>
1 parent 775c09c commit 4e069c6

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

ubuntu-latest/Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=Europe/Zurich && \
3434
clang-format \
3535
clang-tools \
3636
cmake \
37+
default-jdk-headless \
3738
docker.io \
3839
gcc \
3940
gcc-mingw-w64 \
@@ -59,7 +60,6 @@ RUN DEBIAN_FRONTEND=noninteractive TZ=Europe/Zurich && \
5960
python3-jinja2 \
6061
zlib1g-dev \
6162
maven \
62-
openjdk-11-jdk \
6363
valgrind \
6464
flex bison \
6565
lsb-release software-properties-common \
@@ -92,5 +92,8 @@ RUN if [ "$ARCH" = "x86_64" ]; then \
9292
echo cuPQC_DIR="/cupqc/cupqc/cupqc-pkg-0.2.0/cmake/" >> .bashrc; \
9393
fi
9494

95+
# set JAVA_HOME for liboqs-java builds
96+
ENV JAVA_HOME="/usr/lib/jvm/default-java"
97+
9598
# Activate if we want to test specific OpenSSL3 versions:
96-
# 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
99+
# 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)