cleaner config and dockerfile/compose

2024-02-19 17:38:17 +01:00 · 2024-02-19 17:38:17 +01:00 · a1bc5733ee
commit a1bc5733ee
parent 886023b2b9
3 changed files with 3 additions and 8 deletions
--- a/2
+++ b/2
@ -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

--- a/docker-compose.yml
+++ b/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:
--- a/docker_search.json
+++ b/docker_search.json
@ -1,3 +1,3 @@
 {
-    "oc-catalog" : "catalog:49618"
+    "oc-catalog" : "oc-catalog:49618"
 }