From e369dac98633e6a01e9690c0d9358f3c4104c089 Mon Sep 17 00:00:00 2001
From: Ivan Jelic <ivan.jelic@sourcefabric.org>
Date: Mon, 20 May 2024 15:43:45 +0200
Subject: [PATCH] Setting Superdesk to local hostname and Publisher Docker
 network

---
 docker-compose.yml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7d60313..5d1fc80 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,8 +2,6 @@ services:
 
   mongodb:
     image: mongo:4
-    networks:
-      - superdesk
     expose:
       - "27017"
     ports:
@@ -11,8 +9,6 @@ services:
 
   redis:
     image: redis:3
-    networks:
-      - superdesk
     expose:
       - "6379"
     ports:
@@ -22,8 +18,6 @@ services:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.10.1
     environment:
       - discovery.type=single-node
-    networks:
-      - superdesk
     expose:
       - "9200"
       - "9300"
@@ -37,11 +31,11 @@ services:
       - mongodb
       - elastic
     environment:
-      - SUPERDESK_URL=http://localhost:8080/api
+      - SUPERDESK_URL=http://superdesk.local:8080/api
       - DEMO_DATA=1 # install demo data, set to 0 if you want clean install
       - WEB_CONCURRENCY=2
-      - SUPERDESK_CLIENT_URL=http://localhost:8080
-      - CONTENTAPI_URL=http://localhost:8080/capi
+      - SUPERDESK_CLIENT_URL=http://superdesk.local:8080
+      - CONTENTAPI_URL=http://superdesk.local:8080/capi
       - MONGO_URI=mongodb://mongodb/superdesk
       - CONTENTAPI_MONGO_URI=mongodb://mongodb/superdesk_capi
       - PUBLICAPI_MONGO_URI=mongodb://mongodb/superdesk_papi
@@ -52,25 +46,27 @@ services:
       - CELERY_BROKER_URL=redis://redis:6379/1
       - REDIS_URL=redis://redis:6379/1
       - DEFAULT_TIMEZONE=Europe/Prague
-      - SECRET_KEY=*k^&9)byk=8en9n1sg7-xj4f8wr2mh^x#t%_2=1=z@69oxt50!
+      - SECRET_KEY=secretkey
       # More configuration options can be found at https://superdesk.readthedocs.io/en/latest/settings.html
-    networks:
-      - superdesk
 
   superdesk-client:
     build: ./client
     environment:
       # If not hosting on localhost, change these lines
-      - SUPERDESK_URL=http://localhost:8080/api
-      - SUPERDESK_WS_URL=ws://localhost:8080/ws
+      - SUPERDESK_URL=http://superdesk.local:8080/api
+      - SUPERDESK_WS_URL=ws://superdesk.local:8080/ws
       - IFRAMELY_KEY
     depends_on:
       - superdesk-server
     ports:
       - "8080:80"
     networks:
-      - superdesk
+      default:
+        aliases:
+          - superdesk.local
+
 
 networks:
-    superdesk:
-        driver: bridge
+    default:
+      external:
+        name: sp-publisher-network