Delete kafka, zookeeper from docker env (#203)

* Delete kafka, zookeepre * Del kafka, zoo from notify env * Del kafka, zoo from docspace.yml env
ONLYOFFICE · Apr 15, 2024 · c565396 · c565396
1 parent cf9a4af
commit c565396
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 79 deletions.
diff --git a/config/kafka.json b/config/kafka.json
diff --git a/config/zookeeper.json b/config/zookeeper.json
diff --git a/config/zookeeper.test.json b/config/zookeeper.test.json
diff --git a/install/docker/.env b/install/docker/.env
@@ -15,21 +15,6 @@
     APP_DOTNET_ENV=""
     EXTERNAL_PORT="80"
 
-# zookeeper #
-    ZOO_PORT=2181
-    ZOO_HOST=${CONTAINER_PREFIX}zookeeper
-    ZOO_SERVER=server.1=${ZOO_HOST}:2888:3888
-
-# kafka #
-    KAFKA_HOST=${CONTAINER_PREFIX}kafka
-    KAFKA_ADVERTISED_LISTENERS=LISTENER_DOCKER_INTERNAL://${KAFKA_HOST}:9092
-    KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=LISTENER_DOCKER_INTERNAL:PLAINTEXT,LISTENER_DOCKER_EXTERNAL:PLAINTEXT
-    KAFKA_INTER_BROKER_LISTENER_NAME=LISTENER_DOCKER_INTERNAL
-    KAFKA_ZOOKEEPER_CONNECT=${ZOO_HOST}:2181
-    KAFKA_BROKER_ID=1
-    KAFKA_LOG4J_LOGGERS=kafka.controller=INFO,kafka.producer.async.DefaultEventHandler=INFO,state.change.logger=INFO
-    KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR=1
-
 # elasticsearch #
     ELK_CONTAINER_NAME=${CONTAINER_PREFIX}opensearch
     ELK_SHEME=http

diff --git a/install/docker/docker-entrypoint.py b/install/docker/docker-entrypoint.py
@@ -57,7 +57,6 @@
 ELK_THREADS = os.environ["ELK_THREADS"] if environ.get("ELK_THREADS") else "1"
 ELK_CONNECTION_HOST = ELK_HOST if ELK_HOST else ELK_CONTAINER_NAME
 
-KAFKA_HOST = os.environ["KAFKA_HOST"] if environ.get("KAFKA_HOST") else "kafka:9092"
 RUN_FILE = sys.argv[1] if (len(sys.argv) > 1) else "none"
 LOG_FILE = sys.argv[2] if (len(sys.argv) > 2) else "none"
 CORE_EVENT_BUS = sys.argv[3] if (len(sys.argv) > 3) else ""
@@ -224,11 +223,6 @@ def writeJsonFile(jsonFile, jsonData, indent=4):
 jsonData["elastic"]["Threads"] = ELK_THREADS
 writeJsonFile(filePath, jsonData)
 
-filePath = "/app/onlyoffice/config/kafka.json"
-jsonData = openJsonFile(filePath)
-jsonData.update({"kafka": {"BootstrapServers": KAFKA_HOST}})
-writeJsonFile(filePath, jsonData)
-
 filePath = "/app/onlyoffice/config/socket.json"
 jsonData = openJsonFile(filePath)
 updateJsonData(jsonData,"$.socket.port", SERVICE_PORT)

diff --git a/install/docker/docspace.yml b/install/docker/docspace.yml
@@ -32,7 +32,6 @@ x-service: &x-service-base
     DOCUMENT_SERVER_URL_PUBLIC: ${DOCUMENT_SERVER_URL_PUBLIC}
     DOCUMENT_CONTAINER_NAME: ${DOCUMENT_CONTAINER_NAME}
     DOCUMENT_SERVER_URL_EXTERNAL: ${DOCUMENT_SERVER_URL_EXTERNAL}
-    KAFKA_HOST: ${KAFKA_HOST}
     ELK_CONTAINER_NAME: ${ELK_CONTAINER_NAME}
     ELK_SHEME: ${ELK_SHEME}
     ELK_HOST: ${ELK_HOST}

diff --git a/install/docker/kafka.yml b/install/docker/kafka.yml
diff --git a/install/docker/notify.yml b/install/docker/notify.yml
@@ -33,7 +33,6 @@ x-service:
       DOCUMENT_SERVER_URL_PUBLIC: ${DOCUMENT_SERVER_URL_PUBLIC}
       DOCUMENT_CONTAINER_NAME: ${DOCUMENT_CONTAINER_NAME}
       DOCUMENT_SERVER_URL_EXTERNAL: ${DOCUMENT_SERVER_URL_EXTERNAL}
-      KAFKA_HOST: ${KAFKA_HOST}
       ELK_CONTAINER_NAME: ${ELK_CONTAINER_NAME}
       ELK_SHEME: ${ELK_SHEME}
       ELK_HOST: ${ELK_HOST}