Skip to content
Closed
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
4 changes: 2 additions & 2 deletions .github/workflows/container_app_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/container_app_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ 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
run: >
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
Expand Down
1 change: 1 addition & 0 deletions modules/container-configbaker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down