Skip to content

Include plugins in static build #415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HeroCC wants to merge 2 commits into from
Closed

Include plugins in static build #415

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8322194
Build cross-platform static plugins
HeroCC Oct 6, 2021
347f3a2
Add plugins to static tgz distribution
HeroCC Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions static/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ clean: ## remove build artifacts
static: static-linux cross-mac cross-win cross-arm ## create all static packages

.PHONY: static-linux
static-linux: static-cli static-engine ## create tgz with linux x86_64 client and server
static-linux: static-cli static-engine cross-static-plugins-amd64 ## create tgz with linux x86_64 client and server
mkdir -p build/linux/docker
cp $(CLI_DIR)/build/docker build/linux/docker/
for f in dockerd containerd ctr containerd-shim containerd-shim-runc-v2 docker-init docker-proxy runc; do \
cp -L $(ENGINE_DIR)/bundles/binary-daemon/$$f build/linux/docker/$$f; \
done
cp -r build/linux/amd64/docker/ build/linux/docker
tar -C build/linux -c -z -f build/linux/docker-$(GEN_STATIC_VER).tgz docker

# extra binaries for running rootless
Expand Down Expand Up @@ -87,8 +88,9 @@ cross-win: cross-win-engine cross-win-plugins
$(CHOWN) -R $(shell id -u):$(shell id -g) build

.PHONY: cross-arm
cross-arm: cross-all-cli ## create tgz with linux armhf client only
cross-arm: cross-all-cli cross-static-plugins-arm64 ## create tgz with linux armhf client only
mkdir -p build/arm/docker
cp -r build/linux/arm64/docker/cli-plugins build/arm/docker/
cp $(CLI_DIR)/build/docker-linux-arm build/arm/docker/docker
tar -C build/arm -c -z -f build/arm/docker-$(GEN_STATIC_VER).tgz docker

Expand All @@ -115,13 +117,23 @@ BUILD_PLUGIN_RUN_VARS = --rm \
-v "$(CURDIR)/../plugins":/plugins:ro \
-v "$(CURDIR)/scripts/build-cli-plugins":/build:ro

.PHONY: cross-static-plugins
cross-static-plugins: cross-static-plugins-amd64 cross-static-plugins-arm64

.PHONY: cross-static-plugins-%
cross-static-plugins-%: CLI_BUILD_DIR := linux
cross-static-plugins-%:
mkdir -p build/$(CLI_BUILD_DIR)/$*/docker/cli-plugins
GOOS=linux GOARCH=$* docker run $(BUILD_PLUGIN_RUN_VARS) $(DOCKER_CLI_GOLANG_IMG) /build
$(CHOWN) -R $(shell id -u):$(shell id -g) build/$(CLI_BUILD_DIR)/$*

.PHONY: cross-mac-plugins
cross-mac-plugins: cross-mac-plugins-amd64 cross-mac-plugins-arm64

.PHONY: cross-mac-plugins-%
cross-mac-plugins-%: CLI_BUILD_DIR := mac
cross-mac-plugins-%:
mkdir -p build/$(CLI_BUILD_DIR)/$*/docker
mkdir -p build/$(CLI_BUILD_DIR)/$*/docker/cli-plugins
GOOS=darwin GOARCH=$* docker run $(BUILD_PLUGIN_RUN_VARS) $(DOCKER_CLI_GOLANG_IMG) /build
$(CHOWN) -R $(shell id -u):$(shell id -g) build/$(CLI_BUILD_DIR)/$*

Expand Down