Skip to content

Commit 9276c0b

Browse files
author
bingtao.yin
committed
update ide files
1 parent 442ab95 commit 9276c0b

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

.devcontainer/Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@ ENV DORIS_BUILD_PYTHON_VERSION=python3
1313
ENV DORIS_TOOLCHAIN=gcc
1414
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
1515
ENV PATH=${JAVA_HOME}/bin:${PATH}
16+
ENV TZ=Asia/Shanghai
1617

17-
RUN sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list
18-
RUN \
18+
RUN \
19+
# prepare apt
20+
sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list && \
21+
sed -i 's/security.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list && \
1922
echo 'Acquire::ForceIPv4 "true";' >> /etc/apt/apt.conf.d/1000-force-ipv4-transport && \
2023
echo 'Acquire::Retries "100";' >> /etc/apt/apt.conf.d/80-retries && \
2124
apt-get update -y && \
@@ -24,16 +27,19 @@ RUN \
2427
apt-get install -y ${PKGS} && \
2528
add-apt-repository -y ppa:ubuntu-toolchain-r/ppa && \
2629
apt-get update -y && \
27-
PKGS="vim sudo locales git curl unzip wget zip iputils-ping iproute2" && \
30+
PKGS="vim sudo locales git curl unzip wget zip iputils-ping iproute2 tzdata tree" && \
2831
PKGS="${PKGS} gdb net-tools telnet ccache" && \
2932
apt-get install -y ${PKGS} && \
3033
locale-gen en_US.UTF-8 && \
31-
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/timezone && \
34+
echo ${TZ} > /etc/timezone && \
3235
ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
36+
dpkg-reconfigure tzdata && \
3337
# doris build deps
3438
PKGS="openjdk-17-jdk build-essential maven pkg-config cmake byacc flex automake libtool-bin bison binutils-dev libiberty-dev zip unzip libncurses5-dev curl git ninja-build python3" && \
3539
PKGS="${PKGS} libsasl2-dev gcc-10 g++-10 autoconf automake libtool autopoint comerr-dev" && \
3640
PKGS="${PKGS} libkrb5-dev" && \
41+
# misc
42+
PKGS="${PKGS} mysql-client" && \
3743
apt-get install -y ${PKGS} && \
3844
apt-get autoclean && apt-get autoremove && \
3945
rm -rf /var/lib/apt/lists/*

.devcontainer/build.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ common_build_args="
66
--build-arg https_proxy=http://127.0.0.1:18080
77
"
88

9-
# common_build_args="
10-
# --network=host
11-
# --build-arg http_proxy=http://172.16.238.185:58591
12-
# --build-arg https_proxy=http://172.16.238.185:58591
13-
# "
14-
159
common_runtime_args="
1610
--network=host
1711
"

.devcontainer/devcontainer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/cpp
33
{
44
"name": "doris dev",
5-
"image": "doris_build:20250707_70ee521660",
5+
"image": "doris_build:20250707_8849ea0415",
66
"runArgs": [
77
"--network=host",
88
"--privileged",
@@ -43,7 +43,8 @@
4343
"SonarSource.sonarlint-vscode",
4444
"GitHub.copilot",
4545
"zxh404.vscode-proto3",
46-
"llvm-vs-code-extensions.vscode-clangd"
46+
"llvm-vs-code-extensions.vscode-clangd",
47+
"cduruk.thrift"
4748
]
4849
}
4950
},

.devcontainer/tunnel.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
client_ip=$(echo $SSH_CLIENT | awk '{print $1}')
44
local_port=18080
5+
remote_user=ybtsdst
56
remote_port=58591
67

78
echo ${client_ip}
89

9-
ssh -f -N -L ${local_port}:localhost:${remote_port} ybtsdst@${client_ip}
10+
ssh -f -N -L ${local_port}:localhost:${remote_port} ${remote_user}@${client_ip}
1011

1112
echo "tunnel created: ${local_port}-> ${client_ip}:${remote_port}"

0 commit comments

Comments
 (0)