Skip to content

Commit adb676a

Browse files
authored
chore(deps): update the base Docker image (#1157)
This PR updates the base Docker image to incorporate the latest dependencies that fix known vulnerabilities. Signed-off-by: behnazh-w <[email protected]>
1 parent c898a36 commit adb676a

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

docker/Dockerfile.base

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
1-
# Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
33

44
# This Dockerfile is for building the base image which contains the necessary components
55
# to build and run the Docker image.
66
# This image is based on the container-registry.oracle.com/os/oraclelinux:9-slim image and contains the following
77
# components:
8-
# Python3.11.4 compiled and installed from source.
9-
# Oracle JDK 17 downloaded and installed from the tarball.
8+
# Python3.11.13 compiled and installed from source.
109
# Souffle 2.5 compiled and installed from source.
1110
# Other runtime libraries (e.g sqlite-devel) which are installed from dnf.
1211

13-
FROM container-registry.oracle.com/os/oraclelinux:9-slim@sha256:e2aa8053b4a15f27c5f80666be1190d24aa3f403225f2dd6fdb545979f08482a
12+
FROM container-registry.oracle.com/os/oraclelinux:9-slim@sha256:92deb326256d4d3053d210397b00dce9a423789d1c555adb7a3b7a1f0747ea2f
1413

1514
ENV HOME="/home/macaron" \
1615
# Setting Python related environment variables.
17-
PYTHON3_VERSION=3.11.4 \
16+
PYTHON3_VERSION=3.11.13 \
1817
PYTHONUNBUFFERED=1 \
1918
PYTHONDONTWRITEBYTECODE=1 \
2019
# https://github.com/docker-library/python/blob/f568f56f28fab0fe87b34db777e2c2861cef002b/3.11/slim-buster/Dockerfile#L12
2120
LANG="C.UTF-8" \
2221
# The GPG key to verify the source tar ball following the instructions in https://www.python.org/downloads/
2322
PYTHON_SOURCE_GPG="A035C8C19219BA821ECEA86B64E628F8D684696D" \
24-
# Setting Java related environment variables.
25-
JAVA_HOME="/opt/jdk-17.0.12" \
26-
PATH=/usr/local/bin:/opt/jdk-17.0.12/bin:$PATH
23+
PATH=/usr/local/bin:$PATH
2724

2825
# We run the installation of all components in one single RUN to minimize the final image size.
2926
RUN : \
@@ -172,12 +169,6 @@ enabled=1\
172169
[ ! -e "/usr/local/bin/$dst" ]; \
173170
ln -svT "$src" "/usr/local/bin/$dst"; \
174171
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 \
181172
# ---------------------------------------------------------------------------------------------------------------------
182173
# INSTALLING SOUFFLE FROM SOURCE.
183174
# Based on https://github.com/souffle-lang/souffle/blob/master/.github/images/oraclelinux-8/Dockerfile.
@@ -230,8 +221,6 @@ enabled=1\
230221
&& dnf clean all \
231222
&& rm -rf /var/cache/yum \
232223
&& rm -rf /var/cache/dnf \
233-
&& java --version \
234-
&& javac --version \
235224
&& git --version
236225

237226
CMD [ "/bin/bash" ]

docker/Dockerfile.final

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022 - 2023, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2022 - 2025, Oracle and/or its affiliates. All rights reserved.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/.
33

44
# This Dockerfile is for building the final production image. It's based on ghcr.io/oracle/macaron-base and ghcr.io/oracle/maracon-deps.
@@ -11,7 +11,7 @@
1111
# Note that the local machine must login to ghcr.io so that Docker could pull the ghcr.io/oracle/macaron-base
1212
# image for this build.
1313

14-
FROM ghcr.io/oracle/macaron-base:latest@sha256:3b1f5ab197ee4429c598712bb8abb555a094e879f69e35439061777ac3bcb138
14+
FROM ghcr.io/oracle/macaron-base:latest@sha256:e7cb431d2a870999b70a9a282a84e7b278f7a9ea91e60ba2a8efdab35b4b7e71
1515

1616
ENV HOME="/home/macaron"
1717

0 commit comments

Comments
 (0)