Skip to content
Merged
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
21 changes: 20 additions & 1 deletion .github/workflows/container_integration_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,26 @@ jobs:
run: |
set -euo pipefail
mvn -version

# ---------------------------
# FETCH OR BUILD BASE IMAGE
# ---------------------------
- name: Fetch or Build local base image
run: |
set -euo pipefail

# 1. Ask Maven for the expected tag
BASE_IMAGE=$(cd modules/container-base && mvn build-helper:parse-version help:evaluate -Dexpression=base.image -q -DforceStdout -Pct)
echo "Target base image: $BASE_IMAGE"

# 2. Try to pull it. If that fails, build it.
if docker pull "$BASE_IMAGE"; then
echo "✅ Image found and pulled successfully! Skipping local build."
else
echo "⚠️ Pull failed (image likely doesn't exist yet). Building locally..."
mvn -Pct clean package -f modules/container-base/pom.xml
fi

# ---------------------------
# BUILD IMAGES (Dataverse-native)
# ---------------------------
Expand Down Expand Up @@ -282,4 +301,4 @@ jobs:
with:
name: docker-logs
path: docker-logs/
retention-days: 14
retention-days: 14
19 changes: 19 additions & 0 deletions .github/workflows/dataverse_jsf_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,25 @@ jobs:
set -euo pipefail
mvn -version

# ---------------------------
# FETCH OR BUILD BASE IMAGE
# ---------------------------
- name: Fetch or Build local base image
run: |
set -euo pipefail

# 1. Ask Maven for the expected tag
BASE_IMAGE=$(cd modules/container-base && mvn build-helper:parse-version help:evaluate -Dexpression=base.image -q -DforceStdout -Pct)
echo "Target base image: $BASE_IMAGE"

# 2. Try to pull it. If that fails, build it.
if docker pull "$BASE_IMAGE"; then
echo "✅ Image found and pulled successfully! Skipping local build."
else
echo "⚠️ Pull failed (image likely doesn't exist yet). Building locally..."
mvn -Pct clean package -f modules/container-base/pom.xml
fi

# ---------------------------
# BUILD IMAGES (Dataverse-native)
# ---------------------------
Expand Down
Loading