diff --git a/rpm/Makefile b/rpm/Makefile index af6dbadfbd..d30af273c0 100644 --- a/rpm/Makefile +++ b/rpm/Makefile @@ -7,6 +7,7 @@ GEN_RPM_VER=$(shell ./gen-rpm-ver $(realpath $(CURDIR)/../src/github.com/docker/ GEN_SCAN_RPM_VER=$(shell ./gen-rpm-ver $(realpath $(CURDIR)/../src/github.com/docker/scan-cli-plugin) "$(DOCKER_SCAN_REF)") CLI_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/cli) && git rev-parse --short HEAD) ENGINE_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/docker) && git rev-parse --short HEAD) +SCAN_GITCOMMIT?=$(shell cd $(realpath $(CURDIR)/../src/github.com/docker/scan-cli-plugin) && git rev-parse --short HEAD) ifdef BUILD_IMAGE BUILD_IMAGE_FLAG=--build-arg $(BUILD_IMAGE) @@ -33,7 +34,9 @@ RPMBUILD_FLAGS?=-ba\ --define '_release $(word 2,$(GEN_RPM_VER))' \ --define '_version $(word 1,$(GEN_RPM_VER))' \ --define '_origversion $(word 4, $(GEN_RPM_VER))' \ - --define '_scan_version $(word 1,$(GEN_SCAN_RPM_VER))' \ + --define '_scan_rpm_version $(word 1,$(GEN_SCAN_RPM_VER))' \ + --define '_scan_version $(word 4,$(GEN_SCAN_RPM_VER))' \ + --define '_scan_gitcommit $(SCAN_GITCOMMIT)' \ $(RPMBUILD_EXTRA_FLAGS) \ $(SPECS) diff --git a/rpm/SPECS/docker-scan-plugin.spec b/rpm/SPECS/docker-scan-plugin.spec index 752ff5fa2b..c5da401b97 100644 --- a/rpm/SPECS/docker-scan-plugin.spec +++ b/rpm/SPECS/docker-scan-plugin.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} Name: docker-scan-plugin -Version: %{_scan_version} +Version: %{_scan_rpm_version} Release: %{_release}%{?dist} Epoch: 0 Source0: scan-cli-plugin.tgz @@ -26,7 +26,7 @@ Docker Scan plugin for the Docker CLI. %build pushd ${RPM_BUILD_DIR}/src/scan-cli-plugin -bash -c 'GOPROXY="https://proxy.golang.org" PLATFORM_BINARY=docker-scan make native-build' +bash -c 'GOPROXY="https://proxy.golang.org" TAG_NAME="%{_scan_version}" COMMIT="%{_scan_gitcommit}" PLATFORM_BINARY=docker-scan make native-build' popd