build(docker): fix specification of the threads build

Author: thewtex

src/docker/itk-wasm-base/Dockerfile

@@ -49,12 +49,11 @@ RUN . /itk_wasm_env_vars.sh && sed -i -e "/^set(DCMTK_GIT_TAG/c\set(DCMTK_GIT_TA
 
 ARG CMAKE_BUILD_TYPE=Release
 
-ARG LDFLAGS
-ARG CFLAGS
-ARG CXXFLAGS
-ENV LDFLAGS=${LDFLAGS:-"-flto -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB"}
-ENV CFLAGS=${CFLAGS:-"-msimd128 -flto -Wno-warn-absolute-paths -DITK_WASM_NO_FILESYSTEM_IO"}
-ENV CXXFLAGS=${CXXFLAGS:-"${CFLAGS}"}
+ARG LDFLAGS="-flto -s ALLOW_MEMORY_GROWTH=1 -s MAXIMUM_MEMORY=4GB"
+ARG CFLAGS="-msimd128 -flto -Wno-warn-absolute-paths -DITK_WASM_NO_FILESYSTEM_IO"
+ENV LDFLAGS=$LDFLAGS
+ENV CFLAGS=$CFLAGS
+ENV CXXFLAGS=$CFLAGS
 
 RUN mkdir ITK-build && \
   cd ITK-build && \

src/docker/itk-wasm/Dockerfile

@@ -5,10 +5,14 @@ ARG BASE_TAG=latest-$HOST_ARCH
 FROM $BASE_IMAGE:$BASE_TAG
 LABEL maintainer="Matt McCormick [email protected]"
 ARG BASE_IMAGE
+ARG HOST_ARCH=amd64
+ARG BASE_IMAGE=quay.io/itkwasm/emscripten-base
+ARG BASE_TAG=latest-$HOST_ARCH
 ARG CMAKE_BUILD_TYPE=Release
 
 WORKDIR /
 
+ENV BASE_TAG=$BASE_TAG
 ADD ITKWebAssemblyInterfaceModuleCopy /ITKWebAssemblyInterface
 COPY ITKWebAssemblyInterface.cmake /usr/src/
 RUN mv /usr/src/ITKWebAssemblyInterface.cmake /usr/share/cmake-*/Modules/

src/docker/itk-wasm/ITKWebAssemblyInterface.cmake

@@ -46,11 +46,6 @@ function(add_executable target)
   # Suppress CLI11 Encoding_inl.hpp std::wstring_convert deprecation warning
   # Suppress glaze warning about warning: 'static_assert' with a user-generated message is a C++26 extension [-Wc++26-extensions]
   set_property(TARGET ${wasm_target} APPEND PROPERTY COMPILE_OPTIONS -msimd128 -flto -Wno-deprecated-declarations -Wno-c++26-extensions)
-  set (suffix ".wasm")
-  if("$ENV{CFLAGS}" MATCHES "thread")
-    set(suffix ".threads.wasm")
-    set_property(TARGET ${wasm_target} PROPERTY SUFFIX ${suffix})
-  endif()
   if(EMSCRIPTEN)
     set_property(TARGET ${wasm_target} APPEND PROPERTY COMPILE_OPTIONS -Wno-warn-absolute-paths -DITK_WASM_NO_FILESYSTEM_IO)
     kebab_to_camel(${target} targetCamel)
@@ -65,10 +60,17 @@ function(add_executable target)
 
     get_property(_is_imported TARGET ${target} PROPERTY IMPORTED)
     if (NOT ${_is_imported})
-      add_custom_command(TARGET ${target}
-        POST_BUILD
-        COMMAND /usr/bin/zstd -f "$<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>${suffix}" -o "$<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>${suffix}.zst"
-        )
+      if("$ENV{BASE_TAG}" MATCHES "thread")
+        add_custom_command(TARGET ${target}
+          POST_BUILD
+          COMMAND /usr/bin/zstd -f "$<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>.wasm" -o "$<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>.threads.wasm.zst"
+          )
+      else()
+        add_custom_command(TARGET ${target}
+          POST_BUILD
+          COMMAND /usr/bin/zstd -f "$<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>.wasm" -o "$<TARGET_FILE_DIR:${target}>/$<TARGET_FILE_BASE_NAME:${target}>.wasm.zst"
+          )
+      endif()
     endif()
   else()
     # WASI

src/docker/itk-wasm/build.sh

@@ -67,6 +67,7 @@ $exe $build_cmd --pull=false $tag_flag quay.io/itkwasm/emscripten:latest-threads
         --build-arg HOST_ARCH=$host_arch \
         --build-arg CMAKE_BUILD_TYPE=Release \
         --build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \
+        --build-arg BASE_TAG=latest-threads-$host_arch \
         --build-arg VCS_REF=${VCS_REF} \
         --build-arg VCS_URL=${VCS_URL} \
         --build-arg BUILD_DATE=${BUILD_DATE} \
@@ -77,7 +78,7 @@ if $version_tag; then
                 --build-arg HOST_ARCH=$host_arch \
                 --build-arg CMAKE_BUILD_TYPE=Release \
                 --build-arg BASE_IMAGE=quay.io/itkwasm/emscripten-base \
-                --build-arg BASE_TAG=${TAG}-$host_arch \
+                --build-arg BASE_TAG=${TAG}-threads-$host_arch \
                 --build-arg VERSION=${TAG} \
                 --build-arg VCS_REF=${VCS_REF} \
                 --build-arg VCS_URL=${VCS_URL} \
@@ -116,6 +117,7 @@ if $debug; then
           --build-arg IMAGE=quay.io/itkwasm/emscripten \
           --build-arg HOST_ARCH=$host_arch \
           --build-arg CMAKE_BUILD_TYPE=Debug \
+          --build-arg BASE_TAG=latest-debug-$host_arch \
           --build-arg VCS_REF=${VCS_REF} \
           --build-arg VCS_URL=${VCS_URL} \
           --build-arg BUILD_DATE=${BUILD_DATE} \
@@ -136,6 +138,7 @@ if $debug; then
           --build-arg IMAGE=quay.io/itkwasm/emscripten \
           --build-arg HOST_ARCH=$host_arch \
           --build-arg CMAKE_BUILD_TYPE=Debug \
+          --build-arg BASE_TAG=latest-threads-debug-$host_arch \
           --build-arg VCS_REF=${VCS_REF} \
           --build-arg VCS_URL=${VCS_URL} \
           --build-arg BUILD_DATE=${BUILD_DATE} \
@@ -146,7 +149,7 @@ if $debug; then
                 --build-arg HOST_ARCH=$host_arch \
                 --build-arg CMAKE_BUILD_TYPE=Debug \
                 --build-arg VERSION=${TAG}-debug \
-                --build-arg BASE_TAG=${TAG}-debug-$host_arch \
+                --build-arg BASE_TAG=${TAG}-threads-debug-$host_arch \
                 --build-arg VCS_REF=${VCS_REF} \
                 --build-arg VCS_URL=${VCS_URL} \
                 --build-arg BUILD_DATE=${BUILD_DATE} \