Skip to content

Commit

Permalink
Add xz-libs to yum installs, since it is not defaulted to the latest … (
Browse files Browse the repository at this point in the history
#204)

* Add xz-libs to yum installs, since it is not defaulted to the latest version on the base image

* add the xz_libs_version arg
  • Loading branch information
vinnybod committed Jun 14, 2022
1 parent 9e8ba66 commit b14b4b2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ target/
*.iml
.idea/
.ipr

.vscode/
2 changes: 2 additions & 0 deletions base/Dockerfile.ubi8
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ ARG PROCPS_VERSION=""
ARG KRB5_WORKSTATION_VERSION=""
ARG IPUTILS_VERSION=""
ARG HOSTNAME_VERSION=""
ARG XZ_LIBS_VERSION=""

# Zulu OpenJDK version
ARG ZULU_OPENJDK_VERSION=""
Expand Down Expand Up @@ -86,6 +87,7 @@ RUN microdnf --nodocs install yum \
"krb5-workstation${KRB5_WORKSTATION_VERSION}" \
"iputils${IPUTILS_VERSION}" \
"hostname${HOSTNAME_VERSION}" \
"xz-libs${XZ_LIBS_VERSION}" \
"zulu8-ca-jre-headless${ZULU_OPENJDK_VERSION}" "zulu8-ca-jdk-headless${ZULU_OPENJDK_VERSION}" \
&& alternatives --set python /usr/bin/python3 \
&& python3 -m pip install --upgrade "pip${PYTHON_PIP_VERSION}" "setuptools${PYTHON_SETUPTOOLS_VERSION}" \
Expand Down
1 change: 1 addition & 0 deletions base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<KRB5_WORKSTATION_VERSION>-${ubi.krb5.workstation.version}</KRB5_WORKSTATION_VERSION>
<IPUTILS_VERSION>-${ubi.iputils.version}</IPUTILS_VERSION>
<HOSTNAME_VERSION>-${ubi.hostname.version}</HOSTNAME_VERSION>
<XZ_LIBS_VERSION>-${ubi.xzlibs.version}</XZ_LIBS_VERSION>
<ZULU_OPENJDK_VERSION>-${ubi.zulu.openjdk.version}</ZULU_OPENJDK_VERSION>
<PYTHON_PIP_VERSION>==${ubi.python.pip.version}</PYTHON_PIP_VERSION>
<PYTHON_SETUPTOOLS_VERSION>==${ubi.python.setuptools.version}</PYTHON_SETUPTOOLS_VERSION>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<ubi.krb5.workstation.version>1.18.2-14.el8</ubi.krb5.workstation.version>
<ubi.iputils.version>20180629-9.el8</ubi.iputils.version>
<ubi.hostname.version>3.20-6.el8</ubi.hostname.version>
<ubi.xzlibs.version>5.2.4-4.el8_6</ubi.xzlibs.version>
<!-- ZULU OpenJDK Package Version -->
<ubi.zulu.openjdk.version>8.0.332-1</ubi.zulu.openjdk.version>
<!-- Python Module Versions -->
Expand Down

0 comments on commit b14b4b2

Please sign in to comment.