Rename binary to threshold and update build/release packaging
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
306960d24b
commit
5f5d35b9ff
23 files changed
+189
-258
No files matched your search
@@ -55,16 +55,16 @@ dev:
|
||||
.PHONY: build
|
||||
build: BUILD_TAGS+=ui
|
||||
build: build-ui-ifne
|
||||
@echo "==> Building Boundary with UI features enabled"
|
||||
@echo "==> Building Threshold with UI features enabled"
|
||||
@CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/build.sh'"
|
||||
|
||||
.PHONY: build-no-ui
|
||||
build-no-ui:
|
||||
@echo "==> Building Boundary without UI features"
|
||||
@echo "==> Building Threshold without UI features"
|
||||
@CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/build.sh'"
|
||||
|
||||
.PHONY: install
|
||||
install: export BOUNDARY_INSTALL_BINARY=1
|
||||
install: export THRESHOLD_INSTALL_BINARY=1
|
||||
install: build
|
||||
|
||||
.PHONY: install-no-plugins
|
||||
@@ -74,7 +74,7 @@ install-no-plugins: install
|
||||
.PHONY: build-memprof
|
||||
build-memprof: BUILD_TAGS+=memprofiler
|
||||
build-memprof:
|
||||
@echo "==> Building Boundary with memory profiling enabled"
|
||||
@echo "==> Building Threshold with memory profiling enabled"
|
||||
@CGO_ENABLED=$(CGO_ENABLED) BUILD_TAGS='$(BUILD_TAGS)' sh -c "'$(CURDIR)/scripts/build.sh'"
|
||||
|
||||
# Format Go files, ignoring files marked as generated through the header defined at
|
||||
@@ -363,35 +363,14 @@ install-go:
|
||||
./ci/goinstall.sh
|
||||
|
||||
# Docker build and publish variables and targets
|
||||
REGISTRY_NAME?=docker.io/hashicorp
|
||||
IMAGE_NAME=boundary
|
||||
REGISTRY_NAME?=repo.anhonesthost.net/cybercovellc
|
||||
IMAGE_NAME=threshold
|
||||
VERSION?=0.7.4
|
||||
IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(VERSION)
|
||||
IMAGE_TAG_DEV?=$(REGISTRY_NAME)/$(IMAGE_NAME):latest-$(shell git rev-parse --short HEAD)
|
||||
|
||||
.PHONY: docker
|
||||
docker: docker-build
|
||||
|
||||
.PHONY: docker-build
|
||||
# Builds from the releases.hashicorp.com official binary
|
||||
docker-build:
|
||||
docker build \
|
||||
--tag $(IMAGE_TAG) \
|
||||
--tag hashicorp/boundary:latest \
|
||||
--target=official \
|
||||
--build-arg VERSION=$(VERSION) \
|
||||
.
|
||||
|
||||
.PHONY: docker-multiarch-build
|
||||
# Builds multiarch from the releases.hashicorp.com official binary
|
||||
docker-multiarch-build:
|
||||
docker buildx build \
|
||||
--tag $(IMAGE_TAG) \
|
||||
--tag hashicorp/boundary:latest \
|
||||
--target=official \
|
||||
--build-arg VERSION=$(VERSION) \
|
||||
--platform linux/amd64,linux/arm64 \
|
||||
.
|
||||
docker: docker-build-dev
|
||||
|
||||
DEV_DOCKER_GOOS ?= linux
|
||||
DEV_DOCKER_GOARCH ?= amd64
|
||||
@@ -406,7 +385,7 @@ docker-build-dev: build
|
||||
--platform $(DEV_DOCKER_GOOS)/$(DEV_DOCKER_GOARCH) \
|
||||
--tag $(IMAGE_TAG_DEV) \
|
||||
--target=dev \
|
||||
--build-arg=boundary \
|
||||
--build-arg=threshold \
|
||||
.
|
||||
@echo "Successfully built $(IMAGE_TAG_DEV)"
|
||||
|
||||
@@ -417,7 +396,7 @@ docker-build-dev: build
|
||||
version:
|
||||
@go run \
|
||||
-ldflags "-X 'github.com/hashicorp/boundary/version.Version=$(shell cat version/VERSION)'" \
|
||||
./cmd/boundary version \
|
||||
./cmd/threshold version \
|
||||
| awk '/Version Number:/ { print $$3 }'
|
||||
|
||||
EDITION?=
|
||||
@@ -425,7 +404,7 @@ EDITION?=
|
||||
# This is used for release builds by .github/workflows/build.yml
|
||||
edition:
|
||||
@if [ -z "$(EDITION)" ]; then \
|
||||
go run ./cmd/boundary version -format=json | jq -r '.version_metadata // "oss"'; \
|
||||
go run ./cmd/threshold version -format=json | jq -r '.version_metadata // "oss"'; \
|
||||
else \
|
||||
echo $(EDITION); \
|
||||
fi; \
|
||||
Reference in new issue
Block a user