From c565396a99681ed8f6528e3ae647ed65d4c2b102 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Mon, 15 Apr 2024 13:39:31 +0300 Subject: [PATCH] Delete kafka, zookeeper from docker env (#203) * Delete kafka, zookeepre * Del kafka, zoo from notify env * Del kafka, zoo from docspace.yml env --- config/kafka.json | 3 --- config/zookeeper.json | 5 ---- config/zookeeper.test.json | 6 ----- install/docker/.env | 15 ----------- install/docker/docker-entrypoint.py | 6 ----- install/docker/docspace.yml | 1 - install/docker/kafka.yml | 42 ----------------------------- install/docker/notify.yml | 1 - 8 files changed, 79 deletions(-) delete mode 100644 config/kafka.json delete mode 100644 config/zookeeper.json delete mode 100644 config/zookeeper.test.json delete mode 100644 install/docker/kafka.yml diff --git a/config/kafka.json b/config/kafka.json deleted file mode 100644 index 8f173fe541..0000000000 --- a/config/kafka.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "kafka": {} -} diff --git a/config/zookeeper.json b/config/zookeeper.json deleted file mode 100644 index 6a8451dc87..0000000000 --- a/config/zookeeper.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Zookeeper": { - - } -} \ No newline at end of file diff --git a/config/zookeeper.test.json b/config/zookeeper.test.json deleted file mode 100644 index 233c4f63d4..0000000000 --- a/config/zookeeper.test.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "Zookeeper": { - "host": "localhost", - "port": 2181 - } -} \ No newline at end of file diff --git a/install/docker/.env b/install/docker/.env index c4d4ae136e..cef8766b84 100644 --- 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 index b267014f47..137356e1b6 100644 --- a/install/docker/docker-entrypoint.py +++ b/install/docker/docker-entrypoint.py @@ -57,7 +57,6 @@ ELK_PORT = os.environ["ELK_PORT"] if environ.get("ELK_PORT") else "9200" 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 @@ jsonData["elastic"]["Port"] = ELK_PORT 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 index 350da95849..7b2c7f53cf 100644 --- 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 deleted file mode 100644 index b9fa72128e..0000000000 --- a/install/docker/kafka.yml +++ /dev/null @@ -1,42 +0,0 @@ -services: - onlyoffice-zookeeper: - image: zookeeper:latest - container_name: ${ZOO_HOST} - restart: always - expose: - - "2181" - environment: - ZOO_MY_ID: 1 - ZOO_PORT: ${ZOO_PORT:-2181} - ZOO_SERVER: ${ZOO_SERVER} - volumes: - - /app/onlyoffice/data/zookeeper/zoo_data:/data - - /app/onlyoffice/data/zookeeper/zoo_log:/datalog - - onlyoffice-kafka: - image: confluentinc/cp-kafka:latest - container_name: ${KAFKA_HOST} - restart: always - expose: - - "9092" - depends_on: - - onlyoffice-zookeeper - environment: - KAFKA_ADVERTISED_LISTENERS: ${KAFKA_ADVERTISED_LISTENERS} - KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: ${KAFKA_LISTENER_SECURITY_PROTOCOL_MAP} - KAFKA_INTER_BROKER_LISTENER_NAME: ${KAFKA_INTER_BROKER_LISTENER_NAME} - KAFKA_ZOOKEEPER_CONNECT: ${KAFKA_ZOOKEEPER_CONNECT} - KAFKA_BROKER_ID: ${KAFKA_BROKER_ID} - KAFKA_LOG4J_LOGGERS: ${KAFKA_LOG4J_LOGGERS} - KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: ${KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR} - volumes: - #- /app/onlyoffice/data/kafka_data:/var/lib/kafka/data - - kafka_data:/var/lib/kafka/data - -volumes: - kafka_data: - -networks: - default: - name: ${NETWORK_NAME} - external: true diff --git a/install/docker/notify.yml b/install/docker/notify.yml index 46d1828362..6f21d6e4a1 100644 --- 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}