Skip to content

Commit 432e71a

Browse files
cambyzjujeffreys-catMoanasDaddyXu
authored
[fix](ui) fix ui builds failed error (#52711) (#54014)
### What problem does this PR solve? **For fe ui build failed** pick #52711 to branch-2.0 **For start kafka docker env failed** pick #45048 #45091 to branch-2.0 Co-authored-by: Jeffrey <color.dove@gmail.com> Co-authored-by: MoanasDaddyXu <xujianxu@selectdb.com>
1 parent 2891f80 commit 432e71a

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

docker/thirdparties/docker-compose/kafka/kafka.yaml.tpl

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,34 @@ networks:
2222
ipam:
2323
driver: default
2424
config:
25-
- subnet: 168.45.0.0/24
26-
25+
- subnet: 168.51.0.0/24
2726
services:
2827
doris--zookeeper:
29-
image: wurstmeister/zookeeper
28+
image: bitnami/zookeeper
3029
restart: always
3130
container_name: doris--zookeeper
3231
ports:
3332
- ${DOCKER_ZOOKEEPER_EXTERNAL_PORT}:2181
33+
environment:
34+
- ZOO_CFG_LISTEN_PORT=2181
35+
- ALLOW_ANONYMOUS_LOGIN=yes
3436
networks:
3537
- doris--kafka--network
3638
doris--kafka:
37-
image: wurstmeister/kafka
39+
image: bitnami/kafka:2
3840
restart: always
3941
container_name: doris--kafka
4042
depends_on:
4143
- doris--zookeeper
4244
ports:
4345
- ${DOCKER_KAFKA_EXTERNAL_PORT}:19193
4446
environment:
45-
KAFKA_ZOOKEEPER_CONNECT: doris--zookeeper:2181/kafka
46-
KAFKA_LISTENERS: PLAINTEXT://:19193
47-
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:19193
48-
KAFKA_BROKER_ID: 1
47+
- KAFKA_BROKER_ID=1
48+
- KAFKA_LISTENERS=PLAINTEXT://:19193
49+
- KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://localhost:19193
50+
- KAFKA_ZOOKEEPER_CONNECT=doris--zookeeper:2181
51+
- ALLOW_PLAINTEXT_LISTENER=yes
4952
volumes:
5053
- /var/run/docker.sock:/var/run/docker.sock
5154
networks:
52-
- doris--kafka--network
55+
- doris--kafka--network

docker/thirdparties/run-thirdparties-docker.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,23 +255,23 @@ fi
255255
if [[ "${RUN_KAFKA}" -eq 1 ]]; then
256256
# kafka
257257
KAFKA_CONTAINER_ID="${CONTAINER_UID}kafka"
258-
eth0_num=$(ifconfig -a|grep flags=|grep -n ^eth0|awk -F ':' '{print $1}')
259-
IP_HOST=$(ifconfig -a|grep inet|grep -v 127.0.0.1|grep -v inet6|awk '{print $2}'|tr -d "addr:"|tail -n +${eth0_num}|head -n 1)
258+
eth_name=$(ifconfig -a | grep -E "^eth[0-9]" | sort -k1.4n | awk -F ':' '{print $1}' | head -n 1)
259+
IP_HOST=$(ifconfig "${eth_name}" | grep inet | grep -v 127.0.0.1 | grep -v inet6 | awk '{print $2}' | tr -d "addr:" | head -n 1)
260260
cp "${ROOT}"/docker-compose/kafka/kafka.yaml.tpl "${ROOT}"/docker-compose/kafka/kafka.yaml
261261
sed -i "s/doris--/${CONTAINER_UID}/g" "${ROOT}"/docker-compose/kafka/kafka.yaml
262262
sed -i "s/localhost/${IP_HOST}/g" "${ROOT}"/docker-compose/kafka/kafka.yaml
263263
sudo docker compose -f "${ROOT}"/docker-compose/kafka/kafka.yaml --env-file "${ROOT}"/docker-compose/kafka/kafka.env down
264264

265265
create_kafka_topics() {
266-
local container_id="$1"
267-
local ip_host="$2"
268-
local backup_dir=/home/work/pipline/backup_center
266+
local container_id="$1"
267+
local ip_host="$2"
268+
local backup_dir=/home/work/pipline/backup_center
269269

270-
declare -a topics=("basic_data" "basic_array_data" "basic_data_with_errors" "basic_array_data_with_errors" "basic_data_timezone" "basic_array_data_timezone")
270+
declare -a topics=("basic_data" "basic_array_data" "basic_data_with_errors" "basic_array_data_with_errors" "basic_data_timezone" "basic_array_data_timezone" "trino_kafka_basic_data")
271271

272272
for topic in "${topics[@]}"; do
273-
echo "docker exec "${container_id}" bash -c echo '/opt/kafka/bin/kafka-topics.sh --create --broker-list '${ip_host}:19193' --partitions 10' --topic '${topic}'"
274-
docker exec "${container_id}" bash -c "/opt/kafka/bin/kafka-topics.sh --create --broker-list '${ip_host}:19193' --partitions 10' --topic '${topic}'"
273+
echo "docker exec "${container_id}" bash -c echo '/opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server '${ip_host}:19193' --topic '${topic}'"
274+
docker exec "${container_id}" bash -c "/opt/bitnami/kafka/bin/kafka-topics.sh --create --bootstrap-server '${ip_host}:19193' --topic '${topic}'"
275275
done
276276

277277
}

ui/package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,13 @@
3434
"classnames": "^2.2.6",
3535
"i18next": "^19.7.0",
3636
"i18next-browser-languagedetector": "^6.0.1",
37+
"json-bigint": "^1.0.0",
3738
"lodash-decorators": "^6.0.1",
3839
"path-to-regexp": "^2.2.0",
3940
"react": "^16.13.1",
4041
"react-codemirror2": "^7.1.0",
4142
"react-dom": "^16.13.1",
43+
"react-draggable": "4.4.6",
4244
"react-i18next": "^11.7.2",
4345
"react-resizable": "^1.10.1",
4446
"react-router": "^5.2.0",
@@ -77,5 +79,8 @@
7779
"webpack-cli": "^3.3.3",
7880
"webpack-dev-server": "^3.7.1",
7981
"webpack-merge": "^4.2.1"
82+
},
83+
"resolutions": {
84+
"react-draggable": "4.4.6"
8085
}
8186
}

0 commit comments

Comments
 (0)