fix(build): allow Cryostat to be buildable with docker-ce (#1663)

* fix(build): allow Cryostat to be buildable with docker-ce * build(oci): tag image with plain image version as well as version-os-arch * test(runsh): use Cryostat image without os-arch tag by default --------- Co-authored-by: Andrew Azores <[email protected]>
cryostatio · Sep 8, 2023 · df40bde · df40bde
1 parent 8af8a4b
commit df40bde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -453,11 +453,9 @@
             <executable>${imageBuilder}</executable>
             <arguments>
               <argument>save</argument>
-              <argument>--format</argument>
-              <argument>docker-archive</argument>
-              <argument>${baseImage}:${baseImageTag}</argument>
               <argument>--output</argument>
               <argument>${project.build.directory}/${baseImageTarball}</argument>
+              <argument>${baseImage}:${baseImageTag}</argument>
             </arguments>
             <skip>${skipBaseImage}</skip>
           </configuration>
@@ -762,7 +760,7 @@
         </from>
         <to>
           <image>${cryostat.imageStream}</image>
-          <tags>${cryostat.imageVersionLower}-${build.os}-${build.arch}</tags>
+          <tags>${cryostat.imageVersionLower},${cryostat.imageVersionLower}-${build.os}-${build.arch}</tags>
         </to>
         <container>
           <format>OCI</format>

diff --git a/run.sh b/run.sh
@@ -23,7 +23,7 @@ cleanup() {
 trap cleanup EXIT
 
 if [ -z "$CRYOSTAT_IMAGE" ]; then
-    CRYOSTAT_IMAGE="quay.io/cryostat/cryostat:$(${MVN} validate help:evaluate -o -B -q -DforceStdout -Dexpression=cryostat.imageVersionLower)-$(getPomProperty build.os)-$(getPomProperty build.arch)"
+    CRYOSTAT_IMAGE="quay.io/cryostat/cryostat:$(${MVN} validate help:evaluate -o -B -q -DforceStdout -Dexpression=cryostat.imageVersionLower)"
 fi
 
 printf "\n\nRunning %s ...\n\n", "$CRYOSTAT_IMAGE"