update

Author: bingtao.yin

.devcontainer/.env

@@ -4,31 +4,48 @@ ARG http_proxy
 ARG https_proxy
 
 ENV DEBIAN_FRONTEND=noninteractive    
+ENV http_proxy=${http_proxy}
+ENV https_proxy=${https_proxy}
 ENV HTTP_PROXY=${http_proxy}
 ENV HTTPS_PROXY=${https_proxy}
-    
+ENV ALL_PROXY=${http_proxy}
+ENV DORIS_BUILD_PYTHON_VERSION=python3
+ENV DORIS_TOOLCHAIN=gcc
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ENV PATH=${JAVA_HOME}/bin:${PATH}
+
+RUN sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list
 RUN \
-  sed -i 's/archive.ubuntu.com/mirrors.aliyun.com/g' /etc/apt/sources.list && \
   echo 'Acquire::ForceIPv4 "true";' >> /etc/apt/apt.conf.d/1000-force-ipv4-transport && \    
+  echo 'Acquire::Retries "100";' >> /etc/apt/apt.conf.d/80-retries && \
   apt-get update -y && \    
   # basics    
-  PKGS="software-properties-common vim sudo locales git curl unzip wget zip locales iputils-ping" && \    
+  PKGS="software-properties-common" && \
+  apt-get install -y ${PKGS} && \    
+  add-apt-repository -y ppa:ubuntu-toolchain-r/ppa && \
+  apt-get update -y && \    
+  PKGS="vim sudo locales git curl unzip wget zip iputils-ping iproute2" && \    
+  PKGS="${PKGS} gdb net-tools telnet ccache" && \    
   apt-get install -y ${PKGS} && \    
   locale-gen en_US.UTF-8 && \    
   ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/timezone && \    
-  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
+  ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
+  # doris build deps
+  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" && \
+  PKGS="${PKGS} libsasl2-dev gcc-10 g++-10 autoconf automake libtool autopoint comerr-dev" && \
+  PKGS="${PKGS} libkrb5-dev" && \
+  apt-get install -y ${PKGS} && \    
+  apt-get autoclean && apt-get autoremove && \    
+  rm -rf /var/lib/apt/lists/*
 
 ENV LC_ALL="en_US.UTF-8"    
 ENV LANG="en_US.UTF-8"    
 
 RUN \
-  apt install -y openjdk-17-jdk && \
-  apt install -y build-essential maven cmake byacc flex automake libtool-bin bison binutils-dev libiberty-dev zip unzip libncurses5-dev curl git ninja-build python3 && \
-  apt install -y software-properties-common && \
-  add-apt-repository -y ppa:ubuntu-toolchain-r/ppa && \
-  apt update -y && \
-  apt install -y gcc-10 g++-10 && \
-  apt install -y autoconf automake libtool autopoint && \
-  apt-get autoclean && apt-get autoremove && \    
-  rm -rf /var/lib/apt/lists/*    
+  # proxy for wget
+  echo "use_proxy = on" >> /root/.wgetrc && \
+  echo "http_proxy = ${http_proxy}" >> /root/.wgetrc && \
+  echo "https_proxy = ${https_proxy}" >> /root/.wgetrc
+
+WORKDIR /opt/transwarp/doris
 

.devcontainer/Dockerfile

@@ -2,16 +2,25 @@
 
 common_build_args="
   --network=host
-  --build-arg http_proxy=http://172.16.80.252:3128
-  --build-arg https_proxy=http://172.16.80.252:3128
+  --build-arg http_proxy=http://127.0.0.1:18080
+  --build-arg https_proxy=http://127.0.0.1:18080
+"
+
+# common_build_args="
+#   --network=host
+#   --build-arg http_proxy=http://172.16.238.185:58591
+#   --build-arg https_proxy=http://172.16.238.185:58591
+# "
+
+common_runtime_args="
+  --network=host
 "
 
 function image_suffix {
   commit=$(git rev-parse --short HEAD)
   current_date=$(date +%Y%m%d)
 
-  # echo "${current_date}_${commit}"
-  echo "${current_date}"
+  echo "${current_date}_${commit}"
 
   unset commit
   unset current_date
@@ -35,4 +44,20 @@ function build_dev_image {
   unset build_args
 }
 
+# run this under project root directory
+function build_runtime_image {
+  tag=$(image_suffix)
+
+  build_args="
+    ${common_runtime_args}
+  "
 
+  docker build \
+    ${build_args} \
+    -t doris_runtime:${tag} \
+    -f .devcontainer/Dockerfile \
+    .devcontainer/
+
+  unset tag
+  unset build_args
+}

.devcontainer/build.sh

@@ -2,16 +2,19 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/cpp
 {
 	"name": "doris dev",
-	"image": "doris_build:latest",
+	"image": "doris_build:20250707_70ee521660",
 	"runArgs": [
+		"--network=host",
 		"--privileged",
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
-		"seccomp=unconfined"
+		"seccomp=unconfined",
+		"--env-file",".devcontainer/.env"
 	],
 	"mounts": [
 		"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
-		"source=/home/ybtsdst/.m2,target=/root/.m2,type=bind"
+		"source=${localEnv:LOCAL_MVN_REPO},target=/root/.m2,type=bind",
+		"source=${localEnv:LOCAL_CCACHE},target=/opt/ccache,type=bind"
 	],
 	"workspaceMount": "source=${localWorkspaceFolder},target=/opt/transwarp/doris,type=bind,consistency=cached",
 	"workspaceFolder": "/opt/transwarp/doris",

.devcontainer/devcontainer.json

@@ -27,7 +27,7 @@ function create_user {
   useradd --uid $USER_UID --gid $USER_GID -m $USERNAME
 
   # [Optional] Add sudo support. Omit if you don't need to install software after connecting.
-  dnf install -y sudo
+  apt install -y sudo
   echo $USERNAME ALL=\(root\) NOPASSWD:ALL >/etc/sudoers.d/$USERNAME
   chmod 0440 /etc/sudoers.d/$USERNAME
 }
@@ -48,21 +48,20 @@ function main {
   # need to reload vscode to enable cmake language server
 
   # install_by_script
-  install_by_dnf
+#   install_by_dnf
 
   # install other deps
-  dnf install -y gdb net-tools telnet ccache
-  dnf clean all
 
   install_clangd
 
   mkdir -p /root/.ccache
   echo "max_size = 20.0G" >>/root/.ccache/ccache.conf
+  echo "cache_dir = /opt/ccache" >> /root/.ccache/ccache.conf
 
   create_user
 
-  echo "unset http_proxy" >>/root/.bashrc
-  echo "unset https_proxy" >>/root/.bashrc
+#   echo "unset http_proxy" >>/root/.bashrc
+#   echo "unset https_proxy" >>/root/.bashrc
   echo 'export PATH=/usr/local/lib/clangd/bin/:$PATH' >>/root/.bashrc
 
   # enable coredump
@@ -72,7 +71,7 @@ function main {
   # replace container settings.json with our project settings.json
   pushd /root/.vscode-server/data/Machine
   rm -rf settings.json
-  ln -s /opt/transwarp/shiva/.devcontainer/settings.json settings.json
+  ln -s /opt/transwarp/doris/.devcontainer/settings.json settings.json
   popd
 }
 

.devcontainer/postCreateCommand.sh

@@ -1,7 +1,7 @@
 {
     "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx4G -Xms100m -Xlog:disable",
-    "sonarlint.pathToCompileCommands": "/opt/transwarp/shiva/build/compile_commands.json",
-    "sonarlint.testFilePattern": "{/build/shiva/thirdparty/installed/include/**, /usr/include/**, /opt/transwarp/shiva/include/shiva/**}",
+    "sonarlint.pathToCompileCommands": "/opt/transwarp/doris/be/build_Release/compile_commands.json",
+    "sonarlint.testFilePattern": "{/opt/transwarp/doris/thirdparty/installed/include/**, /usr/include/**}",
     "cmake.generator": "Unix Makefiles",
     "editor.quickSuggestions": {
         "other": "on",
@@ -33,12 +33,12 @@
         "--query-driver=/usr/bin/gcc",
         "--suggest-missing-includes",
         "--cross-file-rename",
-        "--compile-commands-dir=/opt/transwarp/shiva/build",
+        "--compile-commands-dir=/opt/transwarp/doris/be/build_Debug",
         "--completion-style=detailed",
-        "-j=4",
+        "-j=40",
         "--all-scopes-completion",
         // "--limit-references=100",
         // "--limit-results=20",
         "--malloc-trim"
     ],
-}
+}