Fix condition for release pipe

solarwinds · Oct 17, 2024 · f598fb5 · f598fb5
1 parent a7fa75e
commit f598fb5
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/cmake/docker-utils.cmake b/cmake/docker-utils.cmake
@@ -148,7 +148,7 @@ function(build_custom_docker_image IMAGE_NAME)
   endforeach()
 
   # Get the value of the environment variable ENABLE_ARM64_BUILD
-  if (DEFINED ENV{ENABLE_ARM64_BUILD} AND ENV{ENABLE_ARM64_BUILD})
+  if (DEFINED ENV{ENABLE_ARM64_BUILD} AND "$ENV{ENABLE_ARM64_BUILD}" STREQUAL "TRUE")
     set(ENABLE_ARM64_BUILD TRUE)
   else()
     set(ENABLE_ARM64_BUILD FALSE)
@@ -164,18 +164,19 @@ function(build_custom_docker_image IMAGE_NAME)
       COMMAND
         docker buildx build --platform linux/amd64 -t "${IMAGE_NAME}" ${DOCKER_ARGS} .
     )
+    if (ENABLE_ARM64_BUILD)
+      add_custom_command(
+        TARGET
+          "${IMAGE_NAME}-docker"
+        WORKING_DIRECTORY
+          "${out_path}"
+        COMMAND
+          docker buildx build --platform linux/arm64 -t "${IMAGE_NAME}-arm64" ${DOCKER_ARGS} .
+    )
+    endif()
   endif()
 
-  if (RUN_DOCKER_COMMANDS AND ENABLE_ARM64_BUILD)
-    add_custom_command(
-    TARGET
-      "${IMAGE_NAME}-docker"
-    WORKING_DIRECTORY
-      "${out_path}"
-    COMMAND
-      docker buildx build --platform linux/arm64 -t "${IMAGE_NAME}-arm64" ${DOCKER_ARGS} .
-  )
-  endif()
+
 
   ###########################
   # push to docker registry #