diff --git a/Makefile b/Makefile index a819742..90d4b0e 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,13 @@ build: clean run: bee run -gendoc=true -downdoc=true -dev: - bee generate routers && HTTPPORT=8088 bee run -gendoc=true -downdoc=true +purge: + lsof -t -i:8088 | xargs kill | true + +run-dev: + bee generate routers && bee run -gendoc=true -downdoc=true -runmode=prod + +dev: purge run-dev debug: bee run -downdebug -gendebug @@ -27,4 +32,4 @@ publish-registry: all: clean docker publish-kind publish-registry -.PHONY: build run clean docker publish-kind publish-registry \ No newline at end of file +.PHONY: build run clean docker publish-kind publish-registry diff --git a/conf/app.conf b/conf/app.conf index 4520ff2..e652559 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -1,5 +1,5 @@ appname = oc-workflow -httpport = 8080 +httpport = 8088 runmode = dev autorender = false copyrequestbody = true diff --git a/controllers/version.go b/controllers/version.go index ff418ed..f943ff6 100644 --- a/controllers/version.go +++ b/controllers/version.go @@ -17,7 +17,10 @@ type VersionController struct { // @Success 200 // @router / [get] func (c *VersionController) GetAll() { - c.Data["json"] = map[string]string{"version": "1"} + c.Data["json"] = map[string]string{ + "service": "oc-workflow", + "version": "1", + } c.ServeJSON() } diff --git a/docker-compose.yml b/docker-compose.yml index 811bc32..56f8573 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,9 +20,9 @@ services: - "traefik.http.routers.workflow.middlewares=workflow-rewrite" - "traefik.http.middlewares.workflow.forwardauth.address=http://oc-auth:8080/oc/forward" networks: - - catalog + - oc networks: - catalog: + oc: external: true diff --git a/docker_conf.json b/docker_conf.json index a5e44a8..144f8f9 100644 --- a/docker_conf.json +++ b/docker_conf.json @@ -2,7 +2,5 @@ "MONGO_URL":"mongodb://mongo:27017/", "MONGO_DATABASE":"DC_myDC", "BOOKING_PATH": ":8092", - "NATS_URL": "nats://nats:4222", - "HOSTNAME": "oc-workflow", - "PORT" : 8080 + "NATS_URL": "nats://nats:4222" } \ No newline at end of file diff --git a/help b/help new file mode 100755 index 0000000..002f824 Binary files /dev/null and b/help differ diff --git a/oc-workflow b/oc-workflow index 13d36af..002f824 100755 Binary files a/oc-workflow and b/oc-workflow differ diff --git a/workflow.json b/workflow.json index 44ce5f8..e31a7ff 100644 --- a/workflow.json +++ b/workflow.json @@ -3,5 +3,5 @@ "MONGO_DATABASE":"DC_myDC", "BOOKING_PATH": ":8092", "NATS_URL": "nats://localhost:4222", - "port" : 8080 + "port" : 8088 } \ No newline at end of file