Merge remote-tracking branch 'origin/main' into feat/opensearch

Author: labrenbe

CHANGELOG.md

@@ -6,8 +6,15 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- ubi9-rust-builder: Include `.tar.gz` snapshots of the operator source code in container images ([#1207])
 - opensearch: Add Opensearch as new product with version `3.1.0` ([#1215]).
 
+### Changed
+
+- all: Use our build-repo to cache NPM dependencies ([#1219])
+
+[#1207]: https://github.com/stackabletech/docker-images/pull/1207
+[#1219]: https://github.com/stackabletech/docker-images/pull/1219
 [#1215]: https://github.com/stackabletech/docker-images/pull/1215
 
 ## [25.7.0] - 2025-07-23

hadoop/Dockerfile

@@ -145,9 +145,7 @@ chmod --recursive g=u /stackable/jmx /stackable/async-profiler "/stackable/hadoo
 # image the 'hadoop checknative' tool still fails because it can't find the 'libcrypto.so' symlink.
 # Therefore we create this symlink here.
 ln -s /usr/lib64/libcrypto.so.3 /usr/lib64/libcrypto.so
-EOF
 
-RUN <<EOF
 # ----------------------------------------
 # Checks
 # This section is to run final checks to ensure the created final images

kafka/Dockerfile

@@ -31,6 +31,7 @@ find . -type f -print0 | xargs -0 sed -i "s/\-stackable0\.0\.0\-dev/-stackable${
 tar -czf /stackable/kafka-${NEW_VERSION}-src.tar.gz .
 
 # TODO: Try to install gradle via package manager (if possible) instead of fetching it from the internet
+# We patch Kafka to use our Nexus build repo instead
 # We don't specify "-x test" to skip the tests, as we might bump some Kafka internal dependencies in the future and
 # it's a good idea to run the tests in this case.
 ./gradlew clean releaseTarGz

stackable-devel/Dockerfile

@@ -115,3 +115,16 @@ microdnf clean all
 chown ${STACKABLE_USER_UID}:0 /stackable/patchable
 rm -rf /patchable
 EOF
+
+# Make sure NPM and YARN use our build mirror
+# In theory YARN should (I believe) fall back to the npmrc file but we want to make sure...
+COPY --chown=${STACKABLE_USER_UID}:0 stackable-devel/stackable/.npmrc /stackable/.npmrc
+COPY --chown=${STACKABLE_USER_UID}:0 stackable-devel/stackable/.npmrc /root/.npmrc
+
+# YARN v1
+COPY --chown=${STACKABLE_USER_UID}:0 stackable-devel/stackable/.yarnrc /stackable/.yarnrc
+COPY --chown=${STACKABLE_USER_UID}:0 stackable-devel/stackable/.yarnrc /root/.yarnrc
+
+# YARN v2++
+COPY --chown=${STACKABLE_USER_UID}:0 stackable-devel/stackable/.yarnrc.yml /stackable/.yarnrc.yml
+COPY --chown=${STACKABLE_USER_UID}:0 stackable-devel/stackable/.yarnrc.yml /root/.yarnrc.yml

stackable-devel/stackable/.npmrc

@@ -0,0 +1 @@
+registry=https://build-repo.stackable.tech/repository/npm-public/

stackable-devel/stackable/.yarnrc

@@ -0,0 +1 @@
+registry "https://build-repo.stackable.tech/repository/npm-public/"

stackable-devel/stackable/.yarnrc.yml

@@ -0,0 +1 @@
+npmRegistryServer: "https://build-repo.stackable.tech/repository/npm-public/"

ubi9-rust-builder/Dockerfile

@@ -62,6 +62,8 @@ RUN microdnf update \
     openssl-devel \
     pkg-config \
     systemd-devel \
+    # tar needed to create the source code snapshot before building the Rust code
+    tar \
     unzip \
   && microdnf clean all \
   && rm -rf /var/cache/yum
@@ -97,6 +99,7 @@ ONBUILD COPY . /src
 
 ONBUILD RUN <<EOF
 . "$HOME/.cargo/env"
+tar -czf /app/stackable-src.tar.gz .
 cargo auditable --quiet build --release --workspace
 cargo cyclonedx --all --spec-version 1.5 --describe binaries