Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hive/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"jmx_exporter": "1.0.1",
# Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
"java-base": "11",
"java-devel": "1.8.0",
"java-devel": "8",
"hadoop": "3.3.6",
# Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
"aws_java_sdk_bundle": "1.12.367",
Expand All @@ -16,7 +16,7 @@
"jmx_exporter": "1.0.1",
# Hive 3 must be built with Java 8 but will run on Java 11
"java-base": "11",
"java-devel": "1.8.0",
"java-devel": "8",
"hadoop": "3.3.6",
# Keep consistent with the dependency from Hadoop: https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
"aws_java_sdk_bundle": "1.12.367",
Expand Down
16 changes: 11 additions & 5 deletions java-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@ LABEL name="Stackable image for OpenJDK" \
summary="The Stackable OpenJDK base image." \
description="This image is the base image for all Stackable Java product images."

# We need to use EPEL, as openjdk 22 is not shipped with UBI9
RUN rpm --install --replacepkgs https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
RUN cat <<EOF > /etc/yum.repos.d/adoptium.repo
[Adoptium]
name=Adoptium
baseurl=https://packages.adoptium.net/artifactory/rpm/rhel/\$releasever/\$basearch
enabled=1
gpgcheck=1
gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
EOF

RUN microdnf update && \
microdnf install \
# Obviously needed to run Java programs
java-${PRODUCT}-openjdk-headless \
# Needed to run Java programs
"temurin-${PRODUCT}-jre" \
# Needed, because otherwise e.g. Zookeeper fails with
# Caused by: java.io.FileNotFoundException: /usr/lib/jvm/java-11-openjdk-11.0.20.0.8-2.el8.x86_64/lib/tzdb.dat (No such file or directory)
tzdata-java \
Expand All @@ -34,7 +40,7 @@ RUN microdnf update && \

COPY java-base/licenses /licenses

ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jre"

# This image doesn't include the development packages for Java.
# For images that need the devel package (ex. Spark) use this env variable to
Expand Down
2 changes: 1 addition & 1 deletion java-base/versions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
versions = [
{
"product": "1.8.0",
"product": "8",
"vector": "0.41.1",
},
{
Expand Down
17 changes: 12 additions & 5 deletions java-devel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ FROM stackable/image/stackable-base

ARG PRODUCT

# We need to use EPEL, as openjdk 22 is not shipped with UBI9
RUN rpm --install --replacepkgs https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
RUN cat <<EOF > /etc/yum.repos.d/adoptium.repo
[Adoptium]
name=Adoptium
baseurl=https://packages.adoptium.net/artifactory/rpm/rhel/\$releasever/\$basearch
enabled=1
gpgcheck=1
gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
EOF

RUN microdnf update && \
microdnf install -y \
Expand All @@ -27,9 +33,10 @@ RUN microdnf update && \
gettext \
# For the apply_patches.sh script
git \
# needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper
# Needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper
hostname \
java-"${PRODUCT}"-openjdk-devel \
# Needed for compiling Java projects
"temurin-${PRODUCT}-jdk" \
krb5-devel \
libcurl-devel \
make \
Expand All @@ -46,7 +53,7 @@ RUN microdnf update && \
microdnf clean all && \
rm -rf /var/cache/yum

ENV JAVA_HOME=/usr/lib/jvm/jre-${PRODUCT}
ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"

COPY --chown=stackable:0 java-devel/stackable/settings.xml /stackable/.m2/settings.xml

Expand Down
2 changes: 1 addition & 1 deletion java-devel/versions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
versions = [
{
"product": "1.8.0",
"product": "8",
"stackable-base": "1.0.0",
},
{
Expand Down
26 changes: 26 additions & 0 deletions nix/sources.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

198 changes: 198 additions & 0 deletions nix/sources.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion opa/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ ARG BUNDLE_BUILDER_VERSION
RUN microdnf update \
&& microdnf install \
cmake \
findutils \
gcc \
gcc-c++ \
git \
Expand Down
13 changes: 13 additions & 0 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{ sources ? import ./nix/sources.nix
, nixpkgs ? sources.nixpkgs
, pkgs ? import nixpkgs { }
}:

let
bake = pkgs.callPackage (sources.image-tools + "/image-tools.nix") { };
in
pkgs.mkShell {
packages = with pkgs; [
bake
];
}
7 changes: 7 additions & 0 deletions stackable-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ COPY stackable-base/stackable/curlrc /root/.curlrc
RUN <<EOF
microdnf update

# **findutils**
# Needed to find all patch files, used in `apply_patches.sh`
# Added 2024-10:
# TODO: https://nvd.nist.gov/vuln/search/results
# TODO: cpe:2.3:a:gnu:find:-:*:*:*:*:*:*:*
#
# **iputils**
# To make debugging easier, includes things like ping
# Added 2024-03: We cannot find any vulnerabilities in the past years
Expand All @@ -103,6 +109,7 @@ microdnf update
# https://nvd.nist.gov/vuln/search/results?adv_search=true&isCpeNameSearch=true&query=cpe%3A2.3%3Aa%3Agnu%3Atar%3A-%3A*%3A*%3A*%3A*%3A*%3A*%3A*
# cpe:2.3:a:gnu:tar:-:*:*:*:*:*:*:*
microdnf install \
findutils \
iputils \
less \
nano \
Expand Down
2 changes: 0 additions & 2 deletions superset/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ COPY superset/constraints-${PRODUCT}.txt /tmp/constraints.txt
RUN microdnf update \
&& microdnf install \
cyrus-sasl-devel \
# Needed to find all patch files, used in `apply_patches.sh`
findutils \
# Needed by ./configure to work out SQLite compilation flags, see snippet [1] at the end of file
diffutils \
# According to https://stackoverflow.com/q/19530974 normally sqlite3 should be shipped with the Python
Expand Down