diff options
| author | Manuel Bentele | 2021-11-30 14:15:56 +0100 |
|---|---|---|
| committer | Manuel Bentele | 2021-11-30 14:33:53 +0100 |
| commit | b8326e90edc0150d69e0ad54d73bbd003a556875 (patch) | |
| tree | 596f30735d427fd5ff514971f450025f5dcb27bc /CMakeLists.txt | |
| parent | [KERNEL] Add support for Linux kernel 5.15.x LTS (diff) | |
| download | dnbd3-b8326e90edc0150d69e0ad54d73bbd003a556875.tar.gz dnbd3-b8326e90edc0150d69e0ad54d73bbd003a556875.tar.xz dnbd3-b8326e90edc0150d69e0ad54d73bbd003a556875.zip | |
[BUILD] Fix versioning format for Docker tags
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cf11744..69459dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ endif(DNBD3_RELEASE_HARDEN AND CMAKE_BUILD_TYPE MATCHES "Release") # define packaging if Release build is enabled if(CMAKE_BUILD_TYPE MATCHES Release) # get version source package or Git repository - get_repository_version(REPOSITORY_VERSION REPOSITORY_BRANCH ${INCLUDE_VERSION_HEADER} ${CMAKE_BUILD_TYPE} ${GIT_EXECUTABLE} ${CMAKE_SOURCE_DIR}) + get_repository_version(REPOSITORY_VERSION REPOSITORY_VERSION_SHORT REPOSITORY_BRANCH ${INCLUDE_VERSION_HEADER} ${CMAKE_BUILD_TYPE} ${GIT_EXECUTABLE} ${CMAKE_SOURCE_DIR}) # define project version if(KernelHeaders_VERSION) @@ -223,7 +223,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release) find_package(Docker REQUIRED) include(DockerImage) - set(DOCKER_TAG ${CPACK_PACKAGE_NAME}:${REPOSITORY_VERSION_FULL}) + set(DOCKER_TAG ${CPACK_PACKAGE_NAME}:${REPOSITORY_VERSION_SHORT}) # define Ubuntu docker image set(DOCKER_FILE_UBUNTU ${CMAKE_SOURCE_DIR}/pkg/docker/ubuntu-20-04_dockerfile) |