Skip to content
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

feat: Add new build-noziti and docker-noziti targets into Makefile #693

Merged
merged 1 commit into from
Nov 19, 2024
Merged

feat: Add new build-noziti and docker-noziti targets into Makefile #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@ make docker-nats - Builds local docker image with NATS MessageBus support
The locally built Docker image can then be used in place of the published Docker image 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.

```makefile
make build-noziti
make docker-noziti
```

## Packaging

This component is packaged as docker image.
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/edgexfoundry/app-service-configurable

go 1.23

require github.com/edgexfoundry/app-functions-sdk-go/v4 v4.0.0-dev.10
require github.com/edgexfoundry/app-functions-sdk-go/v4 v4.0.0-dev.11

require (
github.com/Microsoft/go-winio v0.6.2 // indirect
Expand All @@ -11,7 +11,7 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/diegoholiveira/jsonlogic/v3 v3.5.3 // indirect
github.com/eclipse/paho.mqtt.golang v1.5.0 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.8 // indirect
github.com/edgexfoundry/go-mod-bootstrap/v4 v4.0.0-dev.9 // indirect
github.com/edgexfoundry/go-mod-configuration/v4 v4.0.0-dev.4 // indirect
github.com/edgexfoundry/go-mod-core-contracts/v4 v4.0.0-dev.5 // indirect
github.com/edgexfoundry/go-mod-messaging/v4 v4.0.0-dev.5 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ github.com/diegoholiveira/jsonlogic/v3 v3.5.3 h1:CPyZQ3fOgiIDZ1yWzPGUpyht5tYTOnR
github.com/diegoholiveira/jsonlogic/v3 v3.5.3/go.mod h1:3nnfWovrlZq2rTpucrJ2KMIS8TMf6IoFneofmeqk/qk=
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/app-functions-sdk-go/v4 v4.0.0-dev.10 h1:pRPHsAvkymAJ1QW27Mj+dZmFItzrH8z3Q5SR4jmdx0Q=
github.com/edgexfoundry/app-functions-sdk-go/v4 v4.0.0-dev.10/go.mod h1:/51KC+wM/9ncn9ie3cljTrFdME8630/64Aj9c7YR44I=
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/app-functions-sdk-go/v4 v4.0.0-dev.11 h1:wCg6uYosbnEhskIkm66rFH6uR0xNfQiZluANURiH1Fo=
github.com/edgexfoundry/app-functions-sdk-go/v4 v4.0.0-dev.11/go.mod h1:0mN6ND+0EH1ERN0UEuWlQy1khhqmrp0MktWA1OoBt44=
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=
Expand Down
6 changes: 6 additions & 0 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ build:
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

Expand All @@ -56,6 +59,9 @@ docker:
docker-nats:
make -C . -e ADD_BUILD_TAGS=include_nats_messaging docker

docker-noziti:
make -e ADD_BUILD_TAGS=no_openziti docker

lint:
@which golangci-lint >/dev/null || echo "WARNING: go linter not installed. To install, run make install-lint"
@if [ "z${ARCH}" = "zx86_64" ] && which golangci-lint >/dev/null ; then golangci-lint run --config .golangci.yml ; else echo "WARNING: Linting skipped (not on x86_64 or linter not installed)"; fi
Expand Down