Skip to content

Commit 8bc93bf

Browse files
authored
[feature](k8s) enable ddc debug (#59292)
1 parent f0fe480 commit 8bc93bf

File tree

7 files changed

+12
-15
lines changed

7 files changed

+12
-15
lines changed

docker/runtime/base-image/Dockerfile_base

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,15 @@ RUN sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/' /etc/apt/apt.conf.d/docker-cl
3535
google-perftools libperl-dev python2-dev \
3636
net-tools ca-certificates openssl && apt-get clean && rm -rf /var/lib/apt/lists/* && mkdir -p /usr/lib/jvm/ && \
3737
ln -sf /usr/lib/linux-tools/`ls /usr/lib/linux-tools/`/perf /usr/bin/perf &&\
38-
ln -s /usr/bin/google-pprof /usr/bin/pprof && \
39-
if echo $TARGETARCH | grep 'arm64' >>/dev/null ; then \
40-
wget -c http://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/toolkit/jdk/bisheng-jdk-17.0.10-linux-aarch64.tar.gz -O - | tar -xz -C /usr/lib/jvm/ && mv /usr/lib/jvm/bisheng-jdk-17.0.10/ /usr/lib/jvm/jdk-17 && \
41-
wget -c http://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/toolkit/jdk/bisheng-jdk-8u352-linux-aarch64.tar.gz -O - | tar -xz -C /usr/lib/jvm/ && mv /usr/lib/jvm/bisheng-jdk1.8.0_352/ /usr/lib/jvm/jdk-8; \
42-
else \
43-
wget -c http://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/toolkit/jdk/openjdk-17.0.2_linux-x64_bin.tar.gz -O - | tar -xz -C /usr/lib/jvm/ && mv /usr/lib/jvm/jdk-17.0.2/ /usr/lib/jvm/jdk-17 && \
44-
wget -c http://selectdb-doris-1308700295.cos.ap-beijing.myqcloud.com/toolkit/jdk/openjdk-8u352-b08-linux-x64.tar.gz -O - | tar -xz -C /usr/lib/jvm/ && mv /usr/lib/jvm/openjdk-8u352-b08-linux-x64/ /usr/lib/jvm/jdk-8; \
45-
fi;
38+
ln -s /usr/bin/google-pprof /usr/bin/pprof;
39+
40+
COPY --from=apache/doris:jdk-latest /usr/lib/jvm/jdk-17 /usr/lib/jvm/jdk-17
41+
COPY --from=apache/doris:jdk-latest /usr/lib/jvm/jdk-8 /usr/lib/jvm/jdk-8
4642

4743
COPY --from=apache/doris:debug-latest /doris-debug /opt/apache-doris/
4844
COPY --from=apache/doris:debug-latest /dorisctl /opt/apache-doris/
4945

5046
WORKDIR /opt/apache-doris
5147

52-
# The last update at: December 1, 2025.
53-
# The docker image tag is changed to: base-5.0
48+
# The last update at: December 23, 2025.
49+
# The docker image tag is changed to: base-6.0

docker/runtime/be/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# get the binary from doris github and utar into resource, update the directory as apache-`version(example:2.0.1)`-bin-`architecture(amd64/arm64)` mode.
2727

2828
# choose a base image
29-
FROM apache/doris:base-5.0
29+
FROM apache/doris:base-6.0
3030

3131
ARG TARGETARCH
3232

docker/runtime/be/resource/be_disaggregated_entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,9 +572,9 @@ resolve_password_from_secret
572572
# parse tls connection variables, if config `enbale_tls=true`, use tls connection to manage node.
573573
parse_tls_connection_variables
574574
collect_env_info
575+
./doris-debug --component be
575576
#add_self $fe_addr || exit $?
576577
check_and_register $fe_addrs
577-
./doris-debug --component be
578578
ulimit -c unlimited
579579
log_stderr "run start_be.sh"
580580
# the server will start in the current terminal session, and the log output and console interaction will be printed to that terminal

docker/runtime/broker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# we have support buildx for amd64 and arm64 architecture image build.
2626
# get the binary from doris github and utar into resource, update the directory as apache-`version(example:2.0.1)`-bin-`architecture(amd64/arm64)` mode.
2727

28-
FROM apache/doris:base-5.0
28+
FROM apache/doris:base-6.0
2929

3030
ARG TARGETARCH
3131

docker/runtime/fe/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
# we have support buildx for amd64 and arm64 architecture image build.
2626
# get the binary from doris github and utar into resource, update the directory as apache-`version(example:2.0.1)`-bin-`architecture(amd64/arm64)` mode.
2727

28-
FROM apache/doris:base-5.0
28+
FROM apache/doris:base-6.0
2929

3030
ARG TARGETARCH
3131

docker/runtime/ms/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# get the binary from doris github and utar into resource, update the directory as apache-`version(example:3.0.0)`-bin-`architecture(amd64/arm64)` mode.
2727

2828
# choose a base image
29-
FROM apache/doris:base-5.0
29+
FROM apache/doris:base-6.0
3030

3131
ARG TARGETARCH
3232

docker/runtime/ms/resource/ms_disaggregated_entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@ if [[ -d $CONFIGMAP_PATH ]]; then
4242
done
4343
fi
4444

45+
./doris-debug --component ms
4546

4647
$DORIS_HOME/ms/bin/start.sh --console --conf=$DORIS_HOME/ms/conf/doris_cloud.conf

0 commit comments

Comments
 (0)