diff --git a/Makefile b/Makefile index 1253836c00..1e95d4e75d 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,9 @@ build: $(MICROSERVICES) build-nats: make -e ADD_BUILD_TAGS=include_nats_messaging build +build-noziti: + make -e ADD_BUILD_TAGS=no_openziti build + tidy: $(GO) mod tidy @@ -188,6 +191,9 @@ docker: $(DOCKERS) docker-nats: make -e ADD_BUILD_TAGS=include_nats_messaging docker +docker-noziti: + make -e ADD_BUILD_TAGS=no_openziti docker + clean_docker_base: docker rmi -f $(LOCAL_CACHE_IMAGE) $(LOCAL_CACHE_IMAGE_BASE) diff --git a/README.md b/README.md index c40fe629c3..af70334ef1 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,16 @@ make docker-nats The locally built Docker images can then be used in place of the published Docker images in your compose file. See [Compose Builder](https://github.com/edgexfoundry/edgex-compose/tree/main/compose-builder#gen) `nat-bus` option to generate compose file for NATS and local dev images. +## Build without OpenZiti zerotrust +Currently, the OpenZiti zerotrust capability is opt-out at build time. This means that the published Docker images include the OpenZiti zerotrust capability. + +The following make commands will build the local binaries or local Docker images without OpenZiti zerotrust capability for the Core and Support services. + +```makefile +make build-noziti +make docker-noziti +``` + ## Get Started EdgeX provides docker images in our organization's [DockerHub page](https://hub.docker.com/u/edgexfoundry/). diff --git a/go.mod b/go.mod index e57a976b24..7fb5b7597d 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23 require ( github.com/eclipse/paho.mqtt.golang v1.5.0 - github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.8 + github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.9 github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.4 github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.5 github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.5 diff --git a/go.sum b/go.sum index 757a07db5e..0d103818ab 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/eclipse/paho.mqtt.golang v1.5.0 h1:EH+bUVJNgttidWFkLLVKaQPGmkTUfQQqjOsyvMGvD6o= github.com/eclipse/paho.mqtt.golang v1.5.0/go.mod h1:du/2qNQVqJf/Sqs4MEL77kR8QTqANF7XU7Fk0aOTAgk= -github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.8 h1:uFy9gOVPCLIyYcHcyP8dWBiGPKBvLS+PfaHK9ab/Z9s= -github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.8/go.mod h1:IvrZ7zaD/0kvN+aAtqdudAPGOa4DprO4SDU3JQhVBUY= +github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.9 h1:GM0LR1f+fAy79G9GpKvKmqX+owrbaT3fhWT6MNBmEbs= +github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.9/go.mod h1:IvrZ7zaD/0kvN+aAtqdudAPGOa4DprO4SDU3JQhVBUY= github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.4 h1:Bw8Bxoc2LjAfkgWvAQtbeqnAaGPmKiCoAHlHGalhnv4= github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.4/go.mod h1:Jc8kjQTAUYzuHbQzRuVzfPZy3QfJGMQ0rGHOhRit7to= github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.5 h1:PHcgm730GAjl8hR5y25OE+YEe6urZhYIcIYGY7TeCWM=