Skip to content

Various update: log4shell removal, testing-tools uid/gid #1192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

lfrancke
Copy link
Member

@lfrancke lfrancke commented Jul 7, 2025

Description

These two are related because the log4shell scanner had uid 1000 hardcoded as well.
It was only used in Omid...

Definition of Done Checklist

Note

Not all of these items are applicable to all PRs, the author should update this template to only leave the boxes in that are relevant.

Please make sure all these things are done and tick the boxes

  • Changes are OpenShift compatible
  • All added packages (via microdnf or otherwise) have a comment on why they are added
  • Things not downloaded from Red Hat repositories should be mirrored in the Stackable repository and downloaded from there
  • All packages should have (if available) signatures/hashes verified
  • Add an entry to the CHANGELOG.md file
  • Integration tests ran successfully
TIP: Running integration tests with a new product image

The image can be built and uploaded to the kind cluster with the following commands:

bake --product <product> --image-version <stackable-image-version>
kind load docker-image <image-tagged-with-the-major-version> --name=<name-of-your-test-cluster>

See the output of bake to retrieve the image tag for <image-tagged-with-the-major-version>.

@lfrancke lfrancke self-assigned this Jul 7, 2025
@lfrancke lfrancke moved this to Development: Waiting for Review in Stackable Engineering Jul 7, 2025
@lfrancke lfrancke enabled auto-merge July 7, 2025 11:00
@@ -53,8 +53,6 @@ RUN microdnf update && \
which \
xz \
zlib-devel \
# Required for log4shell.sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff looks like it is now missing a &&

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I'll take a look!

tar \
zip \
unzip \
# Java 11 seems like the best middle-ground for all tools
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: I still dislike us commenting like 20 lines above and prefer keeping the comments at the line where they apply.
Not blocking this PR

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's not possible with the EOF/heredoc style unfortunately.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use a trick in other places, such as

./mvnw \
--batch-mode \
--no-transfer-progress \
install \
`# -Dmaven.test.skip # Unable to skip test compilation without an unused dependency error for software.amazon.awssdk:identity-spi` \
-DskipTests `# Skip test execution` \
-Dcheckstyle.skip `# Skip checkstyle checks. We dont care if the code is properly formatted, it just wastes time` \
-Dmaven.javadoc.skip=true `# Dont generate javadoc` \
-Ddep.presto-jdbc-under-test=${NEW_VERSION} \
--projects="$SKIP_PROJECTS"

The following diff works:

diff --git a/testing-tools/Dockerfile b/testing-tools/Dockerfile
index 06e10f0..898404f 100644
--- a/testing-tools/Dockerfile
+++ b/testing-tools/Dockerfile
@@ -33,7 +33,6 @@ COPY testing-tools/python /stackable/python
 COPY testing-tools/licenses /licenses
 
 # krb5-user/libkrb5-dev are needed for Kerberos support.
-# Java 11 seems like the best middle-ground for all tools
 RUN <<EOF
 apt-get update
 apt-get install -y --no-install-recommends \
@@ -42,8 +41,10 @@ apt-get install -y --no-install-recommends \
   curl \
   gzip \
   jq \
+  `# Needed for Kerberos support` \
   krb5-user \
   kubernetes-client \
+  `# Needed for Kerberos support` \
   libkrb5-dev \
   libssl-dev \
   libxml2-dev \
@@ -58,6 +59,7 @@ apt-get install -y --no-install-recommends \
   tar \
   zip \
   unzip \
+  `# Java 11 seems like the best middle-ground for all tools` \
   openjdk-11-jdk-headless
 
 apt-get clean

@sbernauer sbernauer moved this from Development: Waiting for Review to Development: In Review in Stackable Engineering Jul 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Development: In Review
Development

Successfully merging this pull request may close these issues.

2 participants