Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ docker_dev_down:

# Deletes all osctrl docker images and volumes
docker_dev_clean:
docker images | grep osctrl | awk '{print $$3}' | xargs -rI {} docker rmi -f {}
docker images --format table | grep osctrl | awk '{print $$3}' | xargs -rI {} docker rmi -f {}
docker volume ls | grep osctrl | awk '{print $$2}' | xargs -rI {} docker volume rm {}

# Rebuild only the TLS server
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/conf/dev/air/.air-osctrl-admin.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ tmp_dir = "/tmp"
cmd = "go build -ldflags \"-s -w -X main.buildCommit=$(git rev-parse HEAD) -X main.buildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)\" -o /opt/osctrl/bin/osctrl-admin /usr/src/app/cmd/admin/*.go"
# It's not necessary to trigger build each time file changes if it's too frequent.
delay = 1000
exclude_dir = ["tmp", "vendor", "testdata", "deploy", "api", "cli", "tls"]
exclude_dir = ["tmp", "vendor", "testdata", "deploy", "api", "cli", "tls" , "tools"]
exclude_file = []
exclude_regex = ["_test\\.go"]
exclude_unchanged = false
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/conf/dev/air/.air-osctrl-api.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tmp_dir = "/tmp"
cmd = "go build -ldflags \"-s -w -X main.buildCommit=$(git rev-parse HEAD) -X main.buildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)\" -o /opt/osctrl/bin/osctrl-api /usr/src/app/cmd/api/*.go"
# It's not necessary to trigger build each time file changes if it's too frequent.
delay = 1000
exclude_dir = ["assets", "tmp", "vendor", "testdata", "deploy", "admin", "tls", "cli"]
exclude_dir = ["assets", "tmp", "vendor", "testdata", "deploy", "admin", "tls", "cli", "tools"]
exclude_file = []
exclude_regex = ["_test.go"]
exclude_unchanged = false
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/conf/dev/air/.air-osctrl-cli.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tmp_dir = "/tmp"
cmd = "go build -ldflags \"-s -w -X main.buildCommit=$(git rev-parse HEAD) -X main.buildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)\" -o /opt/osctrl/bin/osctrl-cli /usr/src/app/cmd/cli/*.go"
# It's not necessary to trigger build each time file changes if it's too frequent.
delay = 1000
exclude_dir = ["tmp", "vendor", "testdata", "deploy", "admin", "tls", "api"]
exclude_dir = ["tmp", "vendor", "testdata", "deploy", "admin", "tls", "api", "tools"]
exclude_file = []
exclude_regex = ["_test\\.go"]
exclude_unchanged = false
Expand Down
2 changes: 1 addition & 1 deletion deploy/docker/conf/dev/air/.air-osctrl-tls.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ tmp_dir = "/tmp"
cmd = "go build -ldflags \"-s -w -X main.buildCommit=$(git rev-parse HEAD) -X main.buildDate=$(date -u +%Y-%m-%dT%H:%M:%SZ)\" -o /opt/osctrl/bin/osctrl-tls /usr/src/app/cmd/tls/*.go"
# It's not necessary to trigger build each time file changes if it's too frequent.
delay = 1000
exclude_dir = ["assets", "tmp", "vendor", "testdata", "deploy", "admin", "api", "cli"]
exclude_dir = ["assets", "tmp", "vendor", "testdata", "deploy", "admin", "api", "cli", "tools"]
exclude_file = []
exclude_regex = ["_test.go"]
exclude_unchanged = false
Expand Down
Loading