66# This image is based on the container-registry.oracle.com/os/oraclelinux:9-slim image and contains the following
77# components:
88# Python3.11.4 compiled and installed from source.
9- # Oracle JDK 17 installed from dnf .
10- # Souffle 2.3 compiled and installed from source.
9+ # Oracle JDK 17 downloaded and installed from the tarball .
10+ # Souffle 2.5 compiled and installed from source.
1111# Other runtime libraries (e.g sqlite-devel) which are installed from dnf.
1212
1313FROM container-registry.oracle.com/os/oraclelinux:9-slim@sha256:e2aa8053b4a15f27c5f80666be1190d24aa3f403225f2dd6fdb545979f08482a
@@ -22,8 +22,8 @@ ENV HOME="/home/macaron" \
2222 # The GPG key to verify the source tar ball following the instructions in https://www.python.org/downloads/
2323 PYTHON_SOURCE_GPG="A035C8C19219BA821ECEA86B64E628F8D684696D" \
2424 # Setting Java related environment variables.
25- JAVA_HOME="/usr/lib/jvm/ jdk-17-oracle-x64 " \
26- PATH=/usr/local/bin:/usr/lib/jvm/ jdk-17-oracle-x64 /bin:$PATH
25+ JAVA_HOME="/opt/ jdk-17.0.12 " \
26+ PATH=/usr/local/bin:/opt/ jdk-17.0.12 /bin:$PATH
2727
2828# We run the installation of all components in one single RUN to minimize the final image size.
2929RUN : \
@@ -72,8 +72,6 @@ enabled=1\
7272 ncurses-devel \
7373 sqlite-devel \
7474 zlib-devel \
75- # Oracle JDK17
76- https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm \
7775 # Store the list of user installed packages to preserve them when we clean up unused packages.
7876 # https://dnf.readthedocs.io/en/latest/command_ref.html#history-command
7977 && USER_MANUAL_INSTALLED="$(dnf history userinstalled | tail -n +2)" \
@@ -174,6 +172,12 @@ enabled=1\
174172 [ ! -e "/usr/local/bin/$dst" ]; \
175173 ln -svT "$src" "/usr/local/bin/$dst"; \
176174 done \
175+ # ---------------------------------------------------------------------------------------------------------------------
176+ # INSTALLING JAVA.
177+ && mkdir -p /opt \
178+ && wget -O jdk-17.0.12_linux-x64_bin.tar.gz https://download.oracle.com/java/17/archive/jdk-17.0.12_linux-x64_bin.tar.gz \
179+ && tar -xvf jdk-17.0.12_linux-x64_bin.tar.gz --directory /opt/ \
180+ && rm jdk-17.0.12_linux-x64_bin.tar.gz \
177181# ---------------------------------------------------------------------------------------------------------------------
178182 # INSTALLING SOUFFLE FROM SOURCE.
179183 # Based on https://github.com/souffle-lang/souffle/blob/master/.github/images/oraclelinux-8/Dockerfile.
@@ -195,7 +199,7 @@ enabled=1\
195199 make \
196200 pkg-config \
197201 rpm-build \
198- && git clone --depth=1 https://github.com/souffle-lang/souffle/ -b 2.4 \
202+ && git clone --depth=1 https://github.com/souffle-lang/souffle/ -b 2.5 \
199203 && cd souffle \
200204 && cmake -S . -B build -DSOUFFLE_DOMAIN_64BIT=ON -DCMAKE_INSTALL_PREFIX="/usr/local" \
201205 && nproc="$(nproc)" \
0 commit comments