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 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"