This is an automated email from the ASF dual-hosted git repository.
catpineapple pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new b5bb57aa5f7 [improve](docker) docker base image add perf and pprof for
CPU profile (#50536)
b5bb57aa5f7 is described below
commit b5bb57aa5f7138732a351bc17a6abec3c7bdcb9f
Author: catpineapple <catpineapple1...@gmail.com>
AuthorDate: Tue Apr 29 18:11:41 2025 +0800
[improve](docker) docker base image add perf and pprof for CPU profile
(#50536)
### What problem does this PR solve?
Add the environment dependency of running CPU profile to the docker base
image
Related PR: #40330
Problem Summary:
### Release note
None
### Check List (For Author)
- Test <!-- At least one of them must be included. -->
- [ ] Regression test
- [ ] Unit Test
- [x] Manual test (add detailed scripts or steps below)
- [ ] No need to test or manual test. Explain why:
- [ ] This is a refactor/code format and no logic has been changed.
- [ ] Previous test can cover this change.
- [ ] No code files have been changed.
- [ ] Other reason <!-- Add your reason? -->
- Behavior changed:
- [ ] No.
- [x] Yes. <!-- Explain the behavior change -->
- Does this need documentation?
- [x] No.
- [ ] Yes. <!-- Add document PR link here. eg:
https://github.com/apache/doris-website/pull/1214 -->
### Check List (For Reviewer who merge this PR)
- [ ] Confirm the release note
- [ ] Confirm test cases
- [ ] Confirm document
- [ ] Add branch pick label <!-- Add branch pick label that this PR
should merge into -->
---
docker/runtime/base-image/Dockerfile_base | 8 +++++++-
docker/runtime/be/Dockerfile | 2 +-
docker/runtime/broker/Dockerfile | 2 +-
docker/runtime/fe/Dockerfile | 2 +-
docker/runtime/ms/Dockerfile | 2 +-
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/docker/runtime/base-image/Dockerfile_base
b/docker/runtime/base-image/Dockerfile_base
index a2bbdf43062..c82aab5f5bf 100644
--- a/docker/runtime/base-image/Dockerfile_base
+++ b/docker/runtime/base-image/Dockerfile_base
@@ -28,11 +28,14 @@ ARG TARGETARCH
RUN sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/'
/etc/apt/apt.conf.d/docker-clean && \
apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y
--no-install-recommends \
- patchelf gdb binutils binutils-common mysql-client iperf3\
+ patchelf gdb binutils binutils-common mysql-client iperf3 \
curl wget less vim htop iproute2 numactl jq iotop sysstat \
tcpdump iputils-ping dnsutils strace lsof blktrace tzdata \
bpfcc-tools linux-headers-realtime linux-tools-realtime silversearcher-ag \
+ google-perftools libperl-dev python2-dev \
net-tools ca-certificates openssl && apt-get clean && rm -rf
/var/lib/apt/lists/* && mkdir -p /usr/lib/jvm/ && \
+ ln -sf /usr/lib/linux-tools/`ls /usr/lib/linux-tools/`/perf /usr/bin/perf
&&\
+ ln -s /usr/bin/google-pprof /usr/bin/pprof && \
if echo $TARGETARCH | grep 'arm64' >>/dev/null ; then \
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 && \
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; \
@@ -44,3 +47,6 @@ RUN sed -i -e 's/^APT/# APT/' -e 's/^DPkg/# DPkg/'
/etc/apt/apt.conf.d/docker-cl
COPY --from=apache/doris:debug-latest /doris-debug /opt/apache-doris/
WORKDIR /opt/apache-doris
+
+# The last update at: April 29, 2025.
+# The docker image tag is changed to: base-2.0
diff --git a/docker/runtime/be/Dockerfile b/docker/runtime/be/Dockerfile
index 612b18bc7f1..925b0e92cd0 100644
--- a/docker/runtime/be/Dockerfile
+++ b/docker/runtime/be/Dockerfile
@@ -26,7 +26,7 @@
# 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.
# choose a base image
-FROM apache/doris:base-latest
+FROM apache/doris:base-2.0
ARG TARGETARCH
diff --git a/docker/runtime/broker/Dockerfile b/docker/runtime/broker/Dockerfile
index 3c6ed515e2c..142dcdbec4c 100644
--- a/docker/runtime/broker/Dockerfile
+++ b/docker/runtime/broker/Dockerfile
@@ -25,7 +25,7 @@
# we have support buildx for amd64 and arm64 architecture image build.
# 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.
-FROM apache/doris:base-latest
+FROM apache/doris:base-2.0
ARG TARGETARCH
diff --git a/docker/runtime/fe/Dockerfile b/docker/runtime/fe/Dockerfile
index 602f6f52879..1f031600903 100644
--- a/docker/runtime/fe/Dockerfile
+++ b/docker/runtime/fe/Dockerfile
@@ -25,7 +25,7 @@
# we have support buildx for amd64 and arm64 architecture image build.
# 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.
-FROM apache/doris:base-latest
+FROM apache/doris:base-2.0
ARG TARGETARCH
diff --git a/docker/runtime/ms/Dockerfile b/docker/runtime/ms/Dockerfile
index 714f11e65e7..b8f42c9b1e3 100644
--- a/docker/runtime/ms/Dockerfile
+++ b/docker/runtime/ms/Dockerfile
@@ -26,7 +26,7 @@
# 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.
# choose a base image
-FROM apache/doris:base-latest
+FROM apache/doris:base-2.0
ARG TARGETARCH
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
