diff --git a/CMakeLists.txt b/CMakeLists.txt index 3437eb3..86aee63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,12 +27,12 @@ endif() find_package(Git QUIET) if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") - execute_process(COMMAND ${GIT_EXECUTABLE} describe --always --tags + execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} RESULT_VARIABLE GIT_RESULT OUTPUT_VARIABLE GIT_HASH) if(NOT GIT_RESULT EQUAL "0") - message(FATAL_ERROR "git describe --always --tags failed with ${GIT_RESULT}") + message(FATAL_ERROR "git rev-parse --short HEAD failed with ${GIT_RESULT}") endif() string(REGEX REPLACE "\n$" "" GIT_HASH "${GIT_HASH}") endif() diff --git a/Dockerfile b/Dockerfile index dbf6d78..c3ef999 100644 --- a/Dockerfile +++ b/Dockerfile @@ -99,8 +99,8 @@ RUN wget https://raw.githubusercontent.com/Telecominfraproject/wlan-cloud-ucentr -O /usr/local/share/ca-certificates/restapi-ca-selfsigned.crt COPY --from=owsub-build /owsub/cmake-build/owsub /openwifi/owsub -COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib /usr/local/lib -COPY --from=poco-build /poco/cmake-build/lib /usr/local/lib +COPY --from=cppkafka-build /cppkafka/cmake-build/src/lib /usr/local/lib/ +COPY --from=poco-build /poco/cmake-build/lib /usr/local/lib/ RUN ldconfig