Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 8738f29

Browse files
authored
Merge pull request #164 from seemethere/cherry_pick_static_file_hashing_commits
[17.06] Move the hashing of files to its own target
2 parents 9df8f75 + 939ee76 commit 8738f29

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

components/packaging/static/Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ static-linux: static-cli static-engine ## create tgz with linux x86_64 client an
2626
cp $(ENGINE_DIR)/bundles/$(ENGINE_VER)/binary-daemon/$$f build/linux/docker; \
2727
done
2828
tar -C build/linux -c -z -f build/linux/docker-$(VERSION).tgz docker
29-
$(HASH_CMD) build/linux
3029

3130
hash_files:
3231
@echo "Hashing directory $(DIR_TO_HASH)"
@@ -36,21 +35,18 @@ cross-mac: cross-all-cli ## create tgz with darwin x86_64 client only
3635
mkdir -p build/mac/docker
3736
cp $(CLI_DIR)/build/docker-darwin-amd64 build/mac/docker/docker
3837
tar -C build/mac -c -z -f build/mac/docker-$(VERSION).tgz docker
39-
$(HASH_CMD) build/mac
4038

4139
cross-win: cross-all-cli cross-win-engine ## create zip file with windows x86_64 client and server
4240
mkdir -p build/win/docker
4341
cp $(CLI_DIR)/build/docker-windows-amd64 build/win/docker/docker.exe
4442
cp $(ENGINE_DIR)/bundles/$(ENGINE_VER)/cross/windows/amd64/dockerd-$(ENGINE_VER).exe build/win/docker/dockerd.exe
4543
docker run --rm -v $(CURDIR)/build/win:/v -w /v $(ALPINE_IMG) sh -c 'apk update&&apk add zip&&zip -r docker-$(VERSION).zip docker'
4644
$(CHOWN) -R $(shell id -u):$(shell id -g) build
47-
$(HASH_CMD) bash hash_files build/win
4845

4946
cross-arm: cross-all-cli ## create tgz with linux armhf client only
5047
mkdir -p build/arm/docker
5148
cp $(CLI_DIR)/build/docker-linux-arm build/arm/docker/docker
5249
tar -C build/arm -c -z -f build/arm/docker-$(VERSION).tgz docker
53-
$(HASH_CMD) build/arm
5450

5551
static-cli:
5652
$(MAKE) -C $(CLI_DIR) -f docker.Makefile VERSION=$(VERSION) build

0 commit comments

Comments
 (0)