wip

Author: dervoeti

druid/Dockerfile

@@ -23,10 +23,8 @@ microdnf update
 #   This requirement is documented in docs/development/build.md and version 5.1 or later is required.
 #   UBI 9 ships with 5.4.x so that should be fine
 #
-# patch: Required for the apply-patches.sh script
 microdnf install \
-python-pyyaml \
-patch
+python-pyyaml
 
 microdnf clean all
 rm -rf /var/cache/yum
@@ -35,8 +33,7 @@ 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:0 druid/stackable/patches/${PRODUCT} /stackable/apache-druid-${PRODUCT}-src/druid/stackable/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
@@ -50,10 +47,8 @@ RUN --mount=type=cache,id=maven-${PRODUCT},uid=${STACKABLE_USER_UID},target=/sta
     --mount=type=cache,id=npm-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.npm \
     --mount=type=cache,id=cache-${PRODUCT},uid=${STACKABLE_USER_UID},target=/stackable/.cache \
     <<EOF
-curl "https://repo.stackable.tech/repository/packages/druid/apache-druid-${PRODUCT}-src.tar.gz" | tar -xzC .
 cd apache-druid-${PRODUCT}-src
-./patches/apply_patches.sh ${PRODUCT}
-
+cd "$(/stackable/patchable --images-repo-root=. checkout druid ${PRODUCT})" && \
 mvn --batch-mode --no-transfer-progress clean install -Pdist,stackable-bundle-contrib-exts -DskipTests -Dmaven.javadoc.skip=true
 mv distribution/target/apache-druid-${PRODUCT}-bin/apache-druid-${PRODUCT} /stackable/
 mv distribution/target/bom.json /stackable/apache-druid-${PRODUCT}/apache-druid-${PRODUCT}.cdx.json

rust/patchable/src/main.rs

@@ -107,6 +107,10 @@ impl ProductVersionContext<'_> {
 struct Opts {
     #[clap(subcommand)]
     cmd: Cmd,
+
+    /// Specify a custom root directory for the images repository
+    #[clap(long)]
+    images_repo_root: Option<PathBuf>,
 }
 
 #[derive(clap::Parser)]
@@ -165,7 +169,7 @@ enum Cmd {
         pv: ProductVersion,
     },
 
-    /// Shwos the images repository root
+    /// Shows the images repository root
     ImagesDir,
 }
 
@@ -201,6 +205,8 @@ pub enum Error {
     FindImagesRepo { source: repo::Error },
     #[snafu(display("images repository has no work directory"))]
     NoImagesRepoWorkdir,
+    #[snafu(display("images repository root at {path:?} is not a directory"))]
+    ImagesRepoRootDirCheck { path: PathBuf },
 
     #[snafu(display("failed to fetch patch series' base commit"))]
     FetchBaseCommit { source: repo::Error },
@@ -263,8 +269,19 @@ fn main() -> Result<()> {
     .context(ConfigureGitLoggingSnafu)?;
 
     let opts = <Opts as clap::Parser>::parse();
-    let images_repo = repo::discover_images_repo(".").context(FindImagesRepoSnafu)?;
-    let images_repo_root = images_repo.workdir().context(NoImagesRepoWorkdirSnafu)?;
+    let images_repo_root_pathbuf = match opts.images_repo_root {
+        Some(path) => {
+            if !path.is_dir() {
+                return ImagesRepoRootDirCheckSnafu { path }.fail();
+            }
+            path
+        }
+        None => {
+            let images_repo = repo::discover_images_repo(".").context(FindImagesRepoSnafu)?;
+            images_repo.workdir().context(NoImagesRepoWorkdirSnafu)?.to_owned()
+        }
+    };
+    let images_repo_root = images_repo_root_pathbuf.as_path();
     match opts.cmd {
         Cmd::Checkout { pv, base_only } => {
             let ctx = ProductVersionContext {

stackable-base/Dockerfile

@@ -59,6 +59,23 @@ rustup toolchain install
 cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
 EOF
 
+FROM product-utils-builder AS patchable
+
+# Copy source code of patchable
+COPY rust/patchable/ /patchable/rust/patchable
+# Copy workspace files
+COPY Cargo.* /patchable/
+
+RUN <<EOF
+microdnf update --assumeyes
+microdnf install --assumeyes openssl-devel pkg-config
+cd /patchable
+. "$HOME/.cargo/env"
+rustup toolchain install
+cargo auditable --quiet build --release && cargo cyclonedx --all --spec-version 1.5 --describe binaries
+microdnf clean all
+EOF
+
 # Find the latest version at https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?container-tabs=gti
 # IMPORTANT: Make sure to use the "Manifest List Digest" that references the images for multiple architectures
 # rather than just the "Image Digest" that references the image for the selected architecture.
@@ -204,6 +221,10 @@ COPY --from=config-utils --chown=${STACKABLE_USER_UID}:0 /config-utils/config-ut
 # Debug tool that logs generic system information.
 COPY --from=containerdebug --chown=${STACKABLE_USER_UID}:0 /containerdebug/target/release/containerdebug /stackable/containerdebug
 
+# **patchable**
+# Tool for patch management
+COPY --from=patchable --chown=${STACKABLE_USER_UID}:0 /patchable/target/release/patchable /stackable/patchable
+
 ENV PATH="${PATH}:/stackable"
 
 # These labels have mostly been superceded by the OpenContainer spec annotations below but it doesn't hurt to include them

zookeeper/Dockerfile

@@ -17,10 +17,9 @@ USER ${STACKABLE_USER_UID}
 WORKDIR /stackable
 
 # Download ZooKeeper sources from our own repo
-RUN curl "https://repo.stackable.tech/repository/packages/zookeeper/apache-zookeeper-${PRODUCT}.tar.gz" | tar -xzC . && \
-    # Apply any required patches
-    patches/apply_patches.sh ${PRODUCT} && \
-    cd /stackable/apache-zookeeper-${PRODUCT}/ && \
+RUN mkdir -p zookeeper/stackable && mv patches zookeeper/stackable/ && \
+    BUILD_SRC_DIR="$(/stackable/patchable --images-repo-root=. checkout zookeeper ${PRODUCT})" && \
+    cd "${BUILD_SRC_DIR}" && \
     # Exclude the `zookeeper-client` submodule, this is not needed and has c parts
     # that created all kinds of issues for the build container
     mvn --batch-mode --no-transfer-progress -pl "!zookeeper-client/zookeeper-client-c" clean install checkstyle:check spotbugs:check -DskipTests -Pfull-build && \
@@ -29,7 +28,7 @@ RUN curl "https://repo.stackable.tech/repository/packages/zookeeper/apache-zooke
     # Unpack the archive which contains the build artifacts from above. Remove some
     # unused files to shrink the final image size.
     tar xvzf /stackable/apache-zookeeper-${PRODUCT}-bin.tar.gz && \
-    mv /stackable/apache-zookeeper-${PRODUCT}/zookeeper-assembly/target/bom.json /stackable/apache-zookeeper-${PRODUCT}-bin/apache-zookeeper-${PRODUCT}.cdx.json && \
+    mv "${BUILD_SRC_DIR}/zookeeper-assembly/target/bom.json" /stackable/apache-zookeeper-${PRODUCT}-bin/apache-zookeeper-${PRODUCT}.cdx.json && \
     rm -rf /stackable/apache-zookeeper-${PRODUCT}-bin/docs && \
     rm /stackable/apache-zookeeper-${PRODUCT}-bin/README_packaging.md && \
     # Download the JMX exporter jar from our own repo