diff options
| author | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2021-02-21 22:44:23 +1000 |
|---|---|---|
| committer | Gerard Ryan <G.M0N3Y.2503@gmail.com> | 2021-02-27 13:29:11 +1000 |
| commit | 0187a8d55ab22e4a77659659b2032586c4bbf894 (patch) | |
| tree | a095ba8124641caebbdb04785efcd0a5a24df341 /utils/dockerd/Makefile | |
| parent | 4bc7ba7fe82563dd64db57317c52824039ab8209 (diff) | |
docker,dockerd: Added git-short-commit to verify short commit
Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
Diffstat (limited to 'utils/dockerd/Makefile')
| -rw-r--r-- | utils/dockerd/Makefile | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile index 067431a6a..c12536a1c 100644 --- a/utils/dockerd/Makefile +++ b/utils/dockerd/Makefile @@ -7,9 +7,11 @@ PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/moby/moby/tar.gz/v$(PKG_VERSION)? +PKG_GIT_URL:=github.com/moby/moby +PKG_GIT_REF:=v$(PKG_VERSION) +PKG_SOURCE_URL:=https://codeload.$(PKG_GIT_URL)/tar.gz/$(PKG_GIT_REF)? PKG_HASH:=dc4818f0cba2ded2f6f7420a1fda027ddbf6c6c9fe319f84d1311bfe610447ca -PKG_SOURCE_VERSION:=8891c58 # SHA1 used within the docker executables +PKG_GIT_SHORT_COMMIT:=8891c58 # SHA1 used within the docker executables PKG_MAINTAINER:=Gerard Ryan <G.M0N3Y.2503@gmail.com> @@ -56,8 +58,8 @@ define EnsureVendoredVersion ( \ DEP_VER=$$$$( grep --only-matching --perl-regexp '(?<=PKG_SOURCE_VERSION:=)(.*)' "$(1)" ); \ VEN_VER=$$$$( grep --only-matching --perl-regexp '(?<=_COMMIT:=)(.*)(?=})' "$(PKG_BUILD_DIR)/hack/dockerfile/install/$(2)" ); \ - if [ $$$$VEN_VER != $$$$DEP_VER ]; then \ - echo "ERROR: Expected 'PKG_SOURCE_VERSION:=$$$$VEN_VER' in '$(1)', found 'PKG_SOURCE_VERSION:=$$$$DEP_VER'"; \ + if [ "$$$${VEN_VER}" != "$$$${DEP_VER}" ]; then \ + echo "ERROR: Expected 'PKG_SOURCE_VERSION:=$$$${VEN_VER}' in '$(1)', found 'PKG_SOURCE_VERSION:=$$$${DEP_VER}'"; \ exit 1; \ fi \ ) @@ -75,9 +77,18 @@ define Build/Prepare # Verify CLI is the same version ( \ CLI_MAKEFILE="../docker/Makefile"; \ - CLI_VERSION=$$$$( grep --only-matching --perl-regexp '(?<=PKG_VERSION:=)(.*)' "$$$$CLI_MAKEFILE" ); \ - if [ $$$$CLI_VERSION != $(PKG_VERSION) ]; then \ - echo "ERROR: Expected 'PKG_VERSION:=$(PKG_VERSION)' in '$$$$CLI_MAKEFILE', found 'PKG_VERSION:=$$$$CLI_VERSION'"; \ + CLI_VERSION=$$$$( grep --only-matching --perl-regexp '(?<=PKG_VERSION:=)(.*)' "$$$${CLI_MAKEFILE}" ); \ + if [ "$$$${CLI_VERSION}" != "$(PKG_VERSION)" ]; then \ + echo "ERROR: Expected 'PKG_VERSION:=$(PKG_VERSION)' in '$$$${CLI_MAKEFILE}', found 'PKG_VERSION:=$$$${CLI_VERSION}'"; \ + exit 1; \ + fi \ + ) + + # Verify PKG_GIT_SHORT_COMMIT + ( \ + EXPECTED_PKG_GIT_SHORT_COMMIT=$$$$( $(CURDIR)/git-short-commit.sh '$(PKG_GIT_URL)' '$(PKG_GIT_REF)' '$(TMP_DIR)/git-short-commit/$(PKG_NAME)-$(PKG_VERSION)' ); \ + if [ "$$$${EXPECTED_PKG_GIT_SHORT_COMMIT}" != "$(strip $(PKG_GIT_SHORT_COMMIT))" ]; then \ + echo "ERROR: Expected 'PKG_GIT_SHORT_COMMIT:=$$$${EXPECTED_PKG_GIT_SHORT_COMMIT}', found 'PKG_GIT_SHORT_COMMIT:=$(strip $(PKG_GIT_SHORT_COMMIT))'"; \ exit 1; \ fi \ ) @@ -95,7 +106,7 @@ define Build/Compile ( \ cd $(PKG_BUILD_DIR); \ $(GO_PKG_VARS) \ - DOCKER_GITCOMMIT=$(PKG_SOURCE_VERSION) \ + DOCKER_GITCOMMIT=$(PKG_GIT_SHORT_COMMIT) \ DOCKER_BUILDTAGS='$(BUILDTAGS)' \ VERSION=$(PKG_VERSION) \ ./hack/make.sh binary; \ |