fix(ct): avoid shell substitutions going awry for base image release tag

Instead of using a Maven reference and dealing with escaping of $ chars, override the suffix with an empty string
IQSS · Sep 16, 2024 · 997f7eb · 997f7eb
1 parent 86f2c84
commit 997f7eb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/container_maintenance.yml b/.github/workflows/container_maintenance.yml
@@ -96,7 +96,7 @@ jobs:
           if [[ "${{ matrix.branch }}" = "${{ env.DEVELOP_BRANCH }}" ]]; then
             NAME=$( mvn initialize help:evaluate -Pct -f modules/container-base -Dexpression=base.image -q -DforceStdout )
           else
-            NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag="\${base.image.tag.release}" -q -DforceStdout )
+            NAME=$( mvn help:evaluate -Pct -f modules/container-base -Dexpression=base.image -Dbase.image.tag.suffix="" -q -DforceStdout )
           fi
           echo "BASE_IMAGE=${NAME}" | tee -a "${GITHUB_ENV}"
 
@@ -129,7 +129,7 @@ jobs:
         uses: gdcc/wip-dataverse-base-image/.github/actions/get-image-revision@10478-version-base-img
         with:
           image-ref: ${{ env.BASE_IMAGE }}
-          tag-options-prefix: "-Dbase.image.tag=\\\\${base.image.tag.release} -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision="
+          tag-options-prefix: "-Dbase.image.tag.suffix='' -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision="
       - name: Configure update of "latest" tag for development branch
         if: ${{ matrix.branch == env.DEVELOP_BRANCH }}
         run: |

diff --git a/modules/container-base/pom.xml b/modules/container-base/pom.xml
@@ -43,8 +43,8 @@
                 <!-- We default to the long version here for the sake of local development. CI will change this for releases. -->
                 <base.image>gdcc/base:${base.image.tag}</base.image>
                 <!-- base.image.version comes from dataverse-parent -->
-                <base.image.tag>${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
-                <base.image.tag.release>${base.image.version}-${java.image.flavor}</base.image.tag.release>
+                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
+                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
                 <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
                 <java.image.flavor>noble</java.image.flavor>
                 <base.image.uid>1000</base.image.uid>

diff --git a/modules/container-base/src/backports/v6.1/001-pom.xml.patch b/modules/container-base/src/backports/v6.1/001-pom.xml.patch
@@ -7,8 +7,8 @@
 -                <base.image.tag>unstable</base.image.tag>
 -                <java.image>eclipse-temurin:${target.java.version}-jre</java.image>
 +                <base.image>gdcc/base:${base.image.tag}</base.image>
-+                <base.image.tag>${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
-+                <base.image.tag.release>${base.image.version}-${java.image.flavor}</base.image.tag.release>
++                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
 +                <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
 +                <java.image.flavor>jammy</java.image.flavor>
                  <base.image.uid>1000</base.image.uid>

diff --git a/modules/container-base/src/backports/v6.2/001-pom.xml.patch b/modules/container-base/src/backports/v6.2/001-pom.xml.patch
@@ -7,8 +7,8 @@
 -                <base.image.tag>unstable</base.image.tag>
 -                <java.image>eclipse-temurin:${target.java.version}-jre</java.image>
 +                <base.image>gdcc/base:${base.image.tag}</base.image>
-+                <base.image.tag>${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
-+                <base.image.tag.release>${base.image.version}-${java.image.flavor}</base.image.tag.release>
++                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
 +                <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
 +                <java.image.flavor>jammy</java.image.flavor>
                  <base.image.uid>1000</base.image.uid>

diff --git a/modules/container-base/src/backports/v6.3/001-pom.xml.patch b/modules/container-base/src/backports/v6.3/001-pom.xml.patch
@@ -7,8 +7,8 @@
 -                <base.image.tag>unstable</base.image.tag>
 -                <java.image>eclipse-temurin:${target.java.version}-jre</java.image>
 +                <base.image>gdcc/base:${base.image.tag}</base.image>
-+                <base.image.tag>${base.image.version}-${java.image.flavor}-p${payara.version}-j${target.java.version}</base.image.tag>
-+                <base.image.tag.release>${base.image.version}-${java.image.flavor}</base.image.tag.release>
++                <base.image.tag>${base.image.version}-${java.image.flavor}${base.image.tag.suffix}</base.image.tag>
++                <base.image.tag.suffix>-p${payara.version}-j${target.java.version}</base.image.tag.suffix>
 +                <java.image>eclipse-temurin:${target.java.version}-jre-${java.image.flavor}</java.image>
 +                <java.image.flavor>jammy</java.image.flavor>
                  <base.image.uid>1000</base.image.uid>