From 64d37fe29374cc4297e191e87863311c57ad38e9 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 11 Dec 2025 11:59:57 -0500
Subject: [PATCH 1/2] add comment: PKGS is for packages to install

---
 modules/container-configbaker/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/container-configbaker/Dockerfile b/modules/container-configbaker/Dockerfile
index 9fc876a283b..66f795fc2aa 100644
--- a/modules/container-configbaker/Dockerfile
+++ b/modules/container-configbaker/Dockerfile
@@ -20,6 +20,7 @@ ENV SCRIPT_DIR="/scripts" \
 ENV PATH="${PATH}:${SCRIPT_DIR}" \
     BOOTSTRAP_DIR="${SCRIPT_DIR}/bootstrap"
 
+# Packages to install
 ARG PKGS="bc curl dnsutils dumb-init ed jq netcat-openbsd postgresql-client"
 # renovate: datasource=github-releases depName=wait4x/wait4x
 ARG WAIT4X_VERSION="v3.2.0"

From a214b0be0d618bfa8c281f3074b98904d5e16699 Mon Sep 17 00:00:00 2001
From: Oliver Bertuch <o.bertuch@fz-juelich.de>
Date: Fri, 12 Dec 2025 10:51:24 +0100
Subject: [PATCH 2/2] ci(ct): enable verbose Docker output for build and
 deployment steps

Added `-Ddocker.verbose` to Maven commands in container workflows to improve clarity and troubleshooting during build and deploy processes.

Without verbose logging, trying to find why a build fails in CI is much harder.
---
 .github/workflows/container_app_pr.yml   | 4 ++--
 .github/workflows/container_app_push.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/container_app_pr.yml b/.github/workflows/container_app_pr.yml
index 898b46c2652..689ace98af0 100644
--- a/.github/workflows/container_app_pr.yml
+++ b/.github/workflows/container_app_pr.yml
@@ -61,12 +61,12 @@ jobs:
             - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests)
               run: >
                   mvn -B -f modules/dataverse-parent
-                  -P ct -pl edu.harvard.iq:dataverse -am
+                  -P ct -Ddocker.verbose -pl edu.harvard.iq:dataverse -am
                   install
             - name: Deploy multi-arch application and configbaker container image
               run: >
                   mvn -Pct deploy 
-                  -Dapp.image.tag=${{ env.IMAGE_TAG }}
+                  -Dapp.image.tag=${{ env.IMAGE_TAG }} -Ddocker.verbose
                   -Ddocker.registry=ghcr.io -Ddocker.platforms=${{ env.PLATFORMS }}
 
             - uses: marocchino/sticky-pull-request-comment@v2
diff --git a/.github/workflows/container_app_push.yml b/.github/workflows/container_app_push.yml
index 0472ab97dee..438902c4546 100644
--- a/.github/workflows/container_app_push.yml
+++ b/.github/workflows/container_app_push.yml
@@ -130,7 +130,7 @@ jobs:
             - name: Build app and configbaker container image with local architecture and submodules (profile will skip tests)
               run: >
                   mvn -B -f modules/dataverse-parent
-                  -P ct -pl edu.harvard.iq:dataverse -am
+                  -P ct -pl edu.harvard.iq:dataverse -am -Ddocker.verbose
                   $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
                   install
             - name: Deploy multi-arch application and configbaker container image
@@ -138,7 +138,7 @@ jobs:
                   mvn 
                   -Dapp.image.tag=${{ env.IMAGE_TAG }} ${{ env.ADDITIONAL_TAGS }}
                   $( [[ -n "${{ inputs.base-image-ref }}" ]] && echo "-Dbase.image=${{ inputs.base-image-ref }}" )
-                  ${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }}
+                  ${{ env.REGISTRY }} -Ddocker.platforms=${{ env.PLATFORMS }} -Ddocker.verbose
                   -P ct deploy
 
             - uses: marocchino/sticky-pull-request-comment@v2