Skip to content

Commit

Permalink
fix(ct): avoid shell substitutions going awry for base image release tag
Browse files Browse the repository at this point in the history
Instead of using a Maven reference and dealing with escaping of $ chars, override the suffix with an empty string
  • Loading branch information
poikilotherm committed Sep 16, 2024
1 parent 86f2c84 commit 2992247
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container_maintenance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.stack-suffix="" -Ddocker.imagePropertyConfiguration=override -Ddocker.tags.revision="
- name: Configure update of "latest" tag for development branch
if: ${{ matrix.branch == env.DEVELOP_BRANCH }}
run: |
Expand Down
4 changes: 2 additions & 2 deletions modules/container-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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.stack-suffix}</base.image.tag>
<base.image.tag.stack-suffix>-p${payara.version}-j${target.java.version}</base.image.tag.stack-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>
Expand Down

0 comments on commit 2992247

Please sign in to comment.