adjustment

Makefile

@@ -6,8 +6,13 @@ build: clean
 run:
 	bee run -gendoc=true -downdoc=true
 
-dev:
-	bee generate routers && HTTPPORT=8089 bee run -gendoc=true -downdoc=true
+purge: 
+	lsof -t -i:8089 | 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: docker publish-kind publish-registry
 
-.PHONY: build run clean docker publish-kind publish-registry
+.PHONY: build run clean docker publish-kind publish-registry

README.md

@@ -4,7 +4,7 @@ Manages user workspaces
 
 To build :
 
-    bee generate routers && bee run -gendoc=true -downdoc=true
+    bee generate routers && bee run -gendoc=true -downdoc=true -runmode=prod
 
 OR 
     make dev

controllers/version.go

@@ -15,7 +15,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-workspace",
+		"version": "1",
+	}
 	c.ServeJSON()
 }
 

docker-compose.base.yml

@@ -1,34 +0,0 @@
-version: '3.4'
-
-services:
-  mongo:
-    image: 'mongo:latest'
-    networks: 
-      - catalog
-    ports:
-      - 27017:27017
-    container_name: mongo
-    volumes: 
-      - oc-catalog-data:/data/db
-      - oc-catalog-data:/data/configdb
-  
-  mongo-express:
-    image: "mongo-express:latest"
-    restart: always
-    depends_on: 
-      - mongo
-    networks: 
-      - catalog
-    ports:
-      - 8081:8081
-    environment:
-      - ME_CONFIG_BASICAUTH_USERNAME=test
-      - ME_CONFIG_BASICAUTH_PASSWORD=test
-
-volumes:
-  oc-catalog-data:
-
-networks: 
-  catalog:
-    external: true
-    # name: catalog

docker-compose.yml

@@ -18,8 +18,8 @@ services:
       - "traefik.http.middlewares.workspace.forwardauth.address=http://oc-auth:8080/oc/forward"
     container_name: oc-workspace
     networks: 
-      - catalog
+      - oc
 
 networks: 
-  catalog:
+  oc:
     external: true

workspace.json

@@ -1,5 +1,5 @@
 {
-    "port":8080,
+    "port":8089,
     "MONGO_URL":"mongodb://localhost:27017/", 
     "MONGO_DATABASE":"DC_myDC"
 }