Makefile

@@ -3,14 +3,14 @@
 build: clean
 	bee pack
 
+base: 
+	docker compose -f docker-compose.base.yml up -d
+
 run:
 	bee run -gendoc=true -downdoc=true
 
-purge:
-	lsof -t -i:8087 | xargs kill | true
-
 run-dev: 
-	bee generate routers && bee run -gendoc=true -downdoc=true
+	bee generate routers && HTTPPORT=8087 bee run -gendoc=true -downdoc=true
 
 debug:
 	bee run -downdebug -gendebug
@@ -30,6 +30,6 @@ publish-registry:
 
 all: docker publish-kind publish-registry
 
-dev: purge run-dev
+dev: base run-dev
 
-.PHONY: build run clean docker publish-kind publish-registry
+.PHONY: build run clean docker publish-kind publish-registry

catalog.json

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

conf/app.conf

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

controllers/version.go

@@ -15,10 +15,7 @@ type VersionController struct {
 // @Success 200
 // @router / [get]
 func (c *VersionController) GetAll() {
-	c.Data["json"] = map[string]string{
-		"service": "oc-catalog",
-		"version": "1",
-	}
+	c.Data["json"] = map[string]string{"version": "1"}
 	c.ServeJSON()
 }
 

docker-compose.base.yml

@@ -0,0 +1,33 @@
+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

docker-compose.yml

@@ -9,7 +9,7 @@ services:
       - 8087:8080
     container_name: oc-catalog
     networks: 
-      - oc
+      - catalog
     labels:
         - "traefik.enable=true"
         - "traefik.http.routers.catalog.entrypoints=web"
@@ -20,5 +20,5 @@ services:
         - "traefik.http.services.catalog.loadbalancer.server.port=8080"
         - "traefik.http.middlewares.catalog.forwardauth.address=http://oc-auth:8080/oc/forward"
 networks: 
-  oc:
+  catalog:
     external: true

swagger/index.html

@@ -39,7 +39,7 @@
     window.onload = function() {
       // Begin Swagger UI call region
       const ui = SwaggerUIBundle({
-        url: "https://petstore.swagger.io/v2/swagger.json",
+        url: "swagger.json",
         dom_id: '#swagger-ui',
         deepLinking: true,
         presets: [