adjustment

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
+.PHONY: build run clean docker publish-kind publish-registry

conf/app.conf

@@ -1,5 +1,5 @@
 appname = oc-workflow
-httpport = 8080
+httpport = 8088
 runmode = dev
 autorender = false
 copyrequestbody = true

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()
 }
 

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
 

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"
 }

workflow.json

@@ -3,5 +3,5 @@
     "MONGO_DATABASE":"DC_myDC",
     "BOOKING_PATH": ":8092",
     "NATS_URL": "nats://localhost:4222",
-    "port" : 8080
+    "port" : 8088
 }