cleaner config and dockerfile/compose

Dockerfile

@@ -32,7 +32,7 @@ COPY scripts scripts
 
 # Configuration file : aims at making your variables suit your environment (local, docker, prod, etc)
 
-COPY local_search.json /etc/oc/search.json
+COPY docker_search.json /etc/oc/search.json
 
 # FROM golang
 

docker-compose.yml

@@ -2,13 +2,8 @@ version: '3.4'
 
 services:
   oc-search:
-<<<<<<< HEAD
-    image: oc-search:debugging
-    container_name: oc-search
-=======
     image: oc-search
-    # container_name: oc-search
->>>>>>> ded5593 (clean Dockerfile and compose)
+    container_name: oc-search
     ports: 
       - 8080:8080
     networks:

docker_search.json

@@ -1,3 +1,3 @@
 {
-    "oc-catalog" : "catalog:49618"
+    "oc-catalog" : "oc-catalog:49618"
 }