File tree Expand file tree Collapse file tree 2 files changed +4
-11
lines changed
Expand file tree Collapse file tree 2 files changed +4
-11
lines changed Original file line number Diff line number Diff line change 1- # Copyright (c) 2023 - 2023 , Oracle and/or its affiliates. All rights reserved.
1+ # Copyright (c) 2023 - 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 workflow builds the base Docker image. The base image will be pushed to ghcr.io.
3131 # only requires docker/Dockerfile.base. The base image will be tagged with ghcr.io/oracle/macaron-base:latest.
3232 - name : Build and push the base image
3333 run : |
34- docker build -t ghcr.io/oracle/macaron-base:latest -f docker/Dockerfile.base docker/
35- docker push ghcr.io/oracle/macaron-base:latest
34+ docker build -t ghcr.io/oracle/macaron-base:test -f docker/Dockerfile.base docker/
35+ docker push ghcr.io/oracle/macaron-base:test
Original file line number Diff line number Diff line change @@ -20,10 +20,7 @@ ENV HOME="/home/macaron" \
2020 # https://github.com/docker-library/python/blob/f568f56f28fab0fe87b34db777e2c2861cef002b/3.11/slim-buster/Dockerfile#L12
2121 LANG="C.UTF-8" \
2222 # The GPG key to verify the source tar ball following the instructions in https://www.python.org/downloads/
23- PYTHON_SOURCE_GPG="A035C8C19219BA821ECEA86B64E628F8D684696D" \
24- # 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
23+ PYTHON_SOURCE_GPG="A035C8C19219BA821ECEA86B64E628F8D684696D"
2724
2825# We run the installation of all components in one single RUN to minimize the final image size.
2926RUN : \
@@ -72,8 +69,6 @@ enabled=1\
7269 ncurses-devel \
7370 sqlite-devel \
7471 zlib-devel \
75- # Oracle JDK17
76- https://download.oracle.com/java/17/latest/jdk-17_linux-x64_bin.rpm \
7772 # Store the list of user installed packages to preserve them when we clean up unused packages.
7873 # https://dnf.readthedocs.io/en/latest/command_ref.html#history-command
7974 && USER_MANUAL_INSTALLED="$(dnf history userinstalled | tail -n +2)" \
@@ -226,8 +221,6 @@ enabled=1\
226221 && dnf clean all \
227222 && rm -rf /var/cache/yum \
228223 && rm -rf /var/cache/dnf \
229- && java --version \
230- && javac --version \
231224 && git --version
232225
233226CMD [ "/bin/bash" ]
You can’t perform that action at this time.
0 commit comments