Merge remote-tracking branch 'IQSS/develop' into RoleAccessHistory

Author: qqmyers

.github/workflows/container_maintenance.yml

@@ -272,6 +272,6 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-          repository: gdcc/base
+          repository: gdcc/configbaker
           short-description: "Dataverse Config Baker Container Image providing setup tooling and more"
           readme-filepath: ./modules/container-configbaker/README.md

.github/workflows/scripts/containers/maintain-application.sh

@@ -126,15 +126,15 @@ for BRANCH in "$@"; do
   # 6. Let's put together what tags we want added to this build run
   TAG_OPTIONS=""
   if ! (( IS_DEV )); then
-    TAG_OPTIONS="-Dapp.image=$APP_IMAGE_REF -Ddocker.tags.revision=$NEXT_REV_TAG"
+    TAG_OPTIONS="-Dapp.image=$APP_IMAGE_REF -Dapp.image.tag.1=$NEXT_REV_TAG"
     # In case of the current release, add the "latest" tag as well.
     if (( IS_CURRENT_RELEASE )); then
-      TAG_OPTIONS="$TAG_OPTIONS -Ddocker.tags.latest=latest"
+      TAG_OPTIONS="$TAG_OPTIONS -Dapp.image.tag.2=latest"
     fi
   else
     # shellcheck disable=SC2016
     UPCOMING_TAG=$( mvn initialize help:evaluate -Pct -f . -Dexpression=app.image.tag -Dapp.image.tag='${app.image.version}-${base.image.flavor}' -q -DforceStdout )
-    TAG_OPTIONS="-Ddocker.tags.upcoming=$UPCOMING_TAG"
+    TAG_OPTIONS="-Dapp.image.tag.1=$UPCOMING_TAG"
 
     # For the dev branch we only have rolling tags and can add them now already
     SUPPORTED_ROLLING_TAGS+=("[\"unstable\", \"$UPCOMING_TAG\"]")
@@ -148,9 +148,8 @@ for BRANCH in "$@"; do
       # Build the application image, but skip the configbaker image (that's a different job)!
       # shellcheck disable=SC2046
       mvn -Pct -f . deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
-        -Dconf.skipBuild -Dbase.image="${BASE_IMAGE_REF}" \
-        -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
-        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push -Ddocker.skip.tag"; fi )
+        -Dconf.skipBuild -Dbase.image="${BASE_IMAGE_REF}" $TAG_OPTIONS \
+        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push"; fi )
     else
       echo "Skipping Maven build as requested by DRY_RUN=1"
     fi

.github/workflows/scripts/containers/maintain-base.sh

@@ -120,6 +120,13 @@ for BRANCH in "$@"; do
   CURRENT_REV_TAG="${BASE_IMAGE_REF#*:}-r$REV"
   NEXT_REV_TAG="${BASE_IMAGE_REF#*:}-r$(( REV + 1 ))"
 
+  # 6a. Determine if we must newly release an "r0" because a rolling tag from development is now released.
+  IS_NEW_RELEASE=0
+  if ! (( IS_DEV )) && [ "$REV" = "-1" ]; then
+    echo "This is a newly released version of Dataverse - forcing build, as no r0 image is present on Docker Hub"
+    IS_NEW_RELEASE=1
+  fi
+
   # 7. Let's put together what tags we want added to this build run
   TAG_OPTIONS=""
   if ! (( IS_DEV )); then
@@ -139,12 +146,12 @@ for BRANCH in "$@"; do
 
   # 8. Let's build the base image if necessary
   NEWER_IMAGE=0
-  if (( NEWER_JAVA_IMAGE + NEWER_PKGS + FORCE_BUILD > 0 )); then
+  if (( NEWER_JAVA_IMAGE + NEWER_PKGS + IS_NEW_RELEASE + FORCE_BUILD > 0 )); then
     if ! (( DRY_RUN )); then
       # shellcheck disable=SC2046
       mvn -Pct -f modules/container-base deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
         -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
-        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push -Ddocker.skip.tag"; fi )
+        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push"; fi )
     else
       echo "Skipping Maven build as requested by DRY_RUN=1"
     fi

.github/workflows/scripts/containers/maintain-configbaker.sh

@@ -122,15 +122,15 @@ for BRANCH in "$@"; do
   # 6. Let's put together what tags we want added to this build run
   TAG_OPTIONS=""
   if ! (( IS_DEV )); then
-    TAG_OPTIONS="-Dconf.image=$CONFIG_IMAGE_REF -Ddocker.tags.revision=$NEXT_REV_TAG"
+    TAG_OPTIONS="-Dconf.image=$CONFIG_IMAGE_REF -Dconf.image.tag.1=$NEXT_REV_TAG"
     # In case of the current release, add the "latest" tag as well.
     if (( IS_CURRENT_RELEASE )); then
-      TAG_OPTIONS="$TAG_OPTIONS -Ddocker.tags.latest=latest"
+      TAG_OPTIONS="$TAG_OPTIONS -Dconf.image.tag.2=latest"
     fi
   else
     # shellcheck disable=SC2016
     UPCOMING_TAG=$( mvn initialize help:evaluate -Pct -f . -Dexpression=conf.image.tag -Dconf.image.tag='${app.image.version}-${conf.image.flavor}' -q -DforceStdout )
-    TAG_OPTIONS="-Ddocker.tags.upcoming=$UPCOMING_TAG"
+    TAG_OPTIONS="-Dconf.image.tag.1=$UPCOMING_TAG"
 
     # For the dev branch we only have rolling tags and can add them now already
     SUPPORTED_ROLLING_TAGS+=("[\"unstable\", \"$UPCOMING_TAG\"]")
@@ -145,9 +145,8 @@ for BRANCH in "$@"; do
       # shellcheck disable=SC2046
       mvn -Pct -f . deploy -Ddocker.noCache -Ddocker.platforms="${PLATFORMS}" \
         -Dapp.skipBuild -Dconf.image.base="${BASE_IMAGE_REF}" \
-        -Dmaven.main.skip -Dmaven.test.skip -Dmaven.war.skip \
-        -Ddocker.imagePropertyConfiguration=override $TAG_OPTIONS \
-        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push -Ddocker.skip.tag"; fi )
+        -Dmaven.main.skip -Dmaven.test.skip -Dmaven.war.skip $TAG_OPTIONS \
+        $( if (( DAMP_RUN )); then echo "-Ddocker.skip.push"; fi )
     else
       echo "Skipping Maven build as requested by DRY_RUN=1"
     fi