Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ All notable changes to this project will be documented in this file.
- spark-k8s: reduce docker image size by removing the recursive chown/chmods in the final image ([#1042]).
- trino: reduce docker image size by removing the recursive chown/chmods in the final image ([#1025]).
- zookeeper: reduce docker image size by removing the recursive chown/chmods in the final image ([#1043]).
- Fixed two hardcoded username references ([#1052]).

[#1025]: https://github.com/stackabletech/docker-images/pull/1025
[#1027]: https://github.com/stackabletech/docker-images/pull/1027
Expand All @@ -64,6 +65,7 @@ All notable changes to this project will be documented in this file.
[#1043]: https://github.com/stackabletech/docker-images/pull/1043
[#1044]: https://github.com/stackabletech/docker-images/pull/1044
[#1050]: https://github.com/stackabletech/docker-images/pull/1050
[#1052]: https://github.com/stackabletech/docker-images/pull/1052
[#1053]: https://github.com/stackabletech/docker-images/pull/1053
[#1054]: https://github.com/stackabletech/docker-images/pull/1054
[#1055]: https://github.com/stackabletech/docker-images/pull/1055
Expand Down
4 changes: 2 additions & 2 deletions druid/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ EOF
USER ${STACKABLE_USER_UID}
WORKDIR /stackable

COPY --chown=stackable:0 druid/stackable/patches/apply_patches.sh /stackable/apache-druid-${PRODUCT}-src/patches/apply_patches.sh
COPY --chown=stackable:0 druid/stackable/patches/${PRODUCT} /stackable/apache-druid-${PRODUCT}-src/patches/${PRODUCT}
COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/apply_patches.sh /stackable/apache-druid-${PRODUCT}-src/patches/apply_patches.sh
COPY --chown=${STACKABLE_USER_UID}:0 druid/stackable/patches/${PRODUCT} /stackable/apache-druid-${PRODUCT}-src/patches/${PRODUCT}

# Cache mounts are owned by root by default
# We need to explicitly give the uid to use which is hardcoded to "1000" in stackable-base
Expand Down
3 changes: 2 additions & 1 deletion java-devel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
FROM stackable/image/stackable-base

ARG PRODUCT
ARG STACKABLE_USER_UID

# See: https://adoptium.net/en-gb/installation/linux/#_centosrhelfedora_instructions
RUN cat <<EOF > /etc/yum.repos.d/adoptium.repo
Expand Down Expand Up @@ -59,7 +60,7 @@ RUN microdnf update && \

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

COPY --chown=stackable:0 java-devel/stackable/settings.xml /stackable/.m2/settings.xml
COPY --chown=${STACKABLE_USER_UID}:0 java-devel/stackable/settings.xml /stackable/.m2/settings.xml

# Mitigation for CVE-2021-44228 (Log4Shell)
# This variable is supported as of Log4j version 2.10 and
Expand Down