fix macOS CI sysroot issue and update to docker compose

Author: d-led

CMakeLists.txt

@@ -1,19 +1,5 @@
 cmake_minimum_required(VERSION 3.20)
 
-# Set proper sysroot for macOS - Conan toolchain sets it to "macosx" which doesn't work with Unix Makefiles
-# Get the actual SDK path before the toolchain overrides it with FORCE
-if(APPLE AND NOT DEFINED CMAKE_OSX_SYSROOT)
-    execute_process(
-        COMMAND xcrun --sdk macosx --show-sdk-path
-        OUTPUT_VARIABLE MACOS_SDK_PATH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-        ERROR_QUIET
-    )
-    if(MACOS_SDK_PATH)
-        set(CMAKE_OSX_SYSROOT "${MACOS_SDK_PATH}" CACHE STRING "macOS SDK Path" FORCE)
-    endif()
-endif()
-
 project(
     influxdb-cpp-rest
     VERSION 1.0.0
@@ -107,6 +93,20 @@ if(USE_CONAN)
                 message(STATUS "Found generators directory: ${GEN_DIR}")
             endif()
         endif()
+        
+        # Fix macOS sysroot after toolchain inclusion - Conan toolchain sets it to "macosx" which doesn't work with Unix Makefiles
+        if(APPLE)
+            execute_process(
+                COMMAND xcrun --sdk macosx --show-sdk-path
+                OUTPUT_VARIABLE MACOS_SDK_PATH
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+                ERROR_QUIET
+            )
+            if(MACOS_SDK_PATH)
+                set(CMAKE_OSX_SYSROOT "${MACOS_SDK_PATH}" CACHE STRING "macOS SDK Path" FORCE)
+                message(STATUS "Fixed macOS sysroot to: ${MACOS_SDK_PATH}")
+            endif()
+        endif()
     endif()
 endif()
 

scripts/start-influxdb.bat

@@ -3,8 +3,8 @@ setlocal
 
 cd /d %~dp0\..
 
-echo Starting InfluxDB with docker-compose...
-docker-compose up -d
+echo Starting InfluxDB with docker compose...
+docker compose up -d
 if errorlevel 1 (
     echo ERROR: Failed to start InfluxDB
     exit /b 1
@@ -13,5 +13,5 @@ if errorlevel 1 (
 echo Waiting for InfluxDB to be ready...
 timeout /t 5 /nobreak >nul
 
-echo InfluxDB started. Check status with: docker-compose ps
+echo InfluxDB started. Check status with: docker compose ps
 

scripts/start-influxdb.sh

@@ -6,8 +6,8 @@ PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 
 cd "${PROJECT_ROOT}"
 
-echo "Starting InfluxDB with docker-compose..."
-docker-compose up -d
+echo "Starting InfluxDB with docker compose..."
+docker compose up -d
 
 echo "Waiting for InfluxDB to be ready..."
 timeout=30
@@ -21,5 +21,5 @@ while [ $elapsed -lt $timeout ]; do
     elapsed=$((elapsed + 1))
 done
 
-echo "Warning: InfluxDB may not be fully ready yet. Check with: docker-compose ps"
+echo "Warning: InfluxDB may not be fully ready yet. Check with: docker compose ps"
 

scripts/stop-influxdb.bat

@@ -4,7 +4,7 @@ setlocal
 cd /d %~dp0\..
 
 echo Stopping InfluxDB...
-docker-compose down
+docker compose down
 if errorlevel 1 (
     echo WARNING: Failed to stop InfluxDB properly
     exit /b 1

scripts/stop-influxdb.sh

@@ -7,7 +7,7 @@ PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)"
 cd "${PROJECT_ROOT}"
 
 echo "Stopping InfluxDB..."
-docker-compose down
+docker compose down
 
 echo "InfluxDB stopped."