Merge pull request #429 from docker/cleanup

cleanup: no longer build binaries

Author: joe0BAB

.github/workflows/build.yml

@@ -153,22 +153,3 @@ EOT
 
 FROM scratch AS proto-generate
 COPY --from=do-proto-generate /generate/out .
-
-FROM gobase AS build-nri-plugin
-ARG TARGETOS
-ARG TARGETARCH
-ARG NRI_PLUGIN_BINARY
-WORKDIR /src
-RUN mkdir /out
-RUN --mount=type=bind,target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=cache,target=/go/pkg/mod \
-    --mount=type=tmpfs,target=/go/src/ <<EOT
-    set -euo pipefail
-    EXT=""
-    [ "$TARGETOS" = "windows" ] && EXT=".exe"
-    CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -trimpath -ldflags "-s -w" -o "/out/${NRI_PLUGIN_BINARY}${EXT}" ./cmd/nri-plugin
-EOT
-
-FROM scratch AS package-nri-plugin
-COPY --link --from=build-nri-plugin /out .

.github/workflows/release.yml

@@ -4,10 +4,6 @@ GO_VERSION := $(shell sh -c "awk '/^go / { print \$$2 }' go.work")
 # For latest version, see: https://github.com/bufbuild/buf/tags
 export BUF_VERSION := v1.56.0
 
-export NRI_PLUGIN_BINARY := nri-secrets-engine
-export PASS_BINARY := docker-pass
-export ENGINE_BINARY := secrets-engine
-
 ifeq ($(OS),Windows_NT)
 	WINDOWS = $(OS)
 	EXTENSION = .exe
@@ -20,16 +16,6 @@ else
 	DOCKER_PASS_DST = $(HOME)/.docker/cli-plugins/$(PASS_BINARY)$(EXTENSION)
 endif
 
-define cross-package
-	@echo packaging $(1)
-	tar -C dist/linux_amd64 -czf dist/$(1)-linux-amd64.tar.gz $(1)
-	tar -C dist/linux_arm64 -czf dist/$(1)-linux-arm64.tar.gz $(1)
-	tar -C dist/darwin_amd64 -czf dist/$(1)-darwin-amd64.tar.gz $(1)
-	tar -C dist/darwin_arm64 -czf dist/$(1)-darwin-arm64.tar.gz $(1)
-	tar -C dist/windows_amd64 -czf dist/$(1)-windows-amd64.tar.gz $(1).exe
-	tar -C dist/windows_arm64 -czf dist/$(1)-windows-arm64.tar.gz $(1).exe
-endef
-
 # golangci-lint must be pinned - linters can become more strict on upgrade
 GOLANGCI_LINT_VERSION := v2.4.0
 export GO_VERSION GOPRIVATE GOLANGCI_LINT_VERSION GIT_COMMIT GIT_TAG
@@ -38,9 +24,6 @@ BUILDER=buildx-multiarch
 
 DOCKER_BUILD_ARGS := --build-arg GO_VERSION \
           			--build-arg GOLANGCI_LINT_VERSION \
-          			--build-arg NRI_PLUGIN_BINARY \
-          			--build-arg PASS_BINARY \
-          			--build-arg ENGINE_BINARY \
           			--build-arg BUF_VERSION \
           			--build-arg GIT_TAG
 
@@ -101,38 +84,6 @@ keychain-unit-tests:
 engine-unit-tests:
 	go test -trimpath -race -v $$(go list ./engine/...)
 
-pass:
-	CGO_ENABLED=1 go build -trimpath -ldflags "-s -w" -o ./dist/$(PASS_BINARY)$(EXTENSION) ./cmd/pass
-	rm "$(DOCKER_PASS_DST)" || true
-	cp "dist/$(PASS_BINARY)$(EXTENSION)" "$(DOCKER_PASS_DST)"
-
-pass-cross: multiarch-builder
-	docker buildx build $(DOCKER_BUILD_ARGS) --pull --builder=$(BUILDER) --target=package-pass --file cmd/pass/Dockerfile --platform=linux/amd64,linux/arm64,darwin/amd64,darwin/arm64,windows/amd64,windows/arm64 -o ./dist .
-
-pass-package: pass-cross
-	$(call cross-package,$(PASS_BINARY))
-
-engine:
-	CGO_ENABLED=1 go build -trimpath -ldflags "-s -w" -o ./dist/$(ENGINE_BINARY)$(EXTENSION) ./cmd/engine
-
-engine-cross: multiarch-builder
-	docker buildx build $(DOCKER_BUILD_ARGS) --pull --builder=$(BUILDER) --target=package-engine \
-		--file cmd/engine/Dockerfile \
-		--platform=linux/amd64,linux/arm64,darwin/amd64,darwin/arm64,windows/amd64,windows/arm64 \
-		-o ./dist .
-
-engine-package: engine-cross
-	$(call cross-package,$(ENGINE_BINARY))
-
-nri-plugin:
-	CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -trimpath -ldflags "-s -w" -o ./dist/$(NRI_PLUGIN_BINARY)$(EXTENSION) ./cmd/nri-plugin
-
-nri-plugin-cross: multiarch-builder
-	docker buildx build $(DOCKER_BUILD_ARGS) --pull --builder=$(BUILDER) --target=package-nri-plugin --platform=linux/amd64,linux/arm64,darwin/amd64,darwin/arm64,windows/amd64,windows/arm64 -o ./dist .
-
-nri-plugin-package: nri-plugin-cross
-	$(call cross-package,$(NRI_PLUGIN_BINARY))
-
 proto-generate:
 	@docker buildx build $(DOCKER_BUILD_ARGS) -o . --target=proto-generate .
 
@@ -182,4 +133,4 @@ help: ## Show this help
 	@echo Please specify a build target. The choices are:
 	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "$(INFO_COLOR)%-30s$(NO_COLOR) %s\n", $$1, $$2}'
 
-.PHONY: run bin format lint proto-lint proto-generate clean help keychain-linux-unit-tests keychain-unit-tests pass pass-cross engine engine-cross
+.PHONY: run bin format lint proto-lint proto-generate clean help keychain-linux-unit-tests keychain-unit-tests