[CI] Add protobuf-devel dep

deepflowio · Mar 28, 2024 · b3f0474 · b3f0474
1 parent bc2dd4e
commit b3f0474
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/agent-build-rust-env.yml b/.github/workflows/agent-build-rust-env.yml
@@ -51,9 +51,9 @@ jobs:
           file: agent/docker/DockerfileToFix.build
           platforms: linux/amd64
           tags: |
-            "ghcr.io/${{ github.repository_owner }}/rust-build:1.29"
+            "ghcr.io/${{ github.repository_owner }}/rust-build:1.30"
             "ghcr.io/${{ github.repository_owner }}/rust-build:latest"
-            "${{ secrets.REGISTRY_ALIYUN_ADDR }}/public/rust-build:1.29"
+            "${{ secrets.REGISTRY_ALIYUN_ADDR }}/public/rust-build:1.30"
             "${{ secrets.REGISTRY_ALIYUN_ADDR }}/public/rust-build:latest"
 
   build_agent_env_arm64:
@@ -98,7 +98,7 @@ jobs:
           file: agent/docker/DockerfileToFix-aarch64.build
           platforms: linux/arm64
           tags: |
-            "ghcr.io/${{ github.repository_owner }}/rust-build:1.29-arm64"
+            "ghcr.io/${{ github.repository_owner }}/rust-build:1.30-arm64"
             "ghcr.io/${{ github.repository_owner }}/rust-build:latest-arm64"
-            "${{ secrets.REGISTRY_ALIYUN_ADDR }}/public/rust-build:1.29-arm64"
+            "${{ secrets.REGISTRY_ALIYUN_ADDR }}/public/rust-build:1.30-arm64"
             "${{ secrets.REGISTRY_ALIYUN_ADDR }}/public/rust-build:latest-arm64"
diff --git a/agent/docker/DockerfileToFix-aarch64.build b/agent/docker/DockerfileToFix-aarch64.build
@@ -10,7 +10,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 
 # Install base dependencies
 RUN yum install make epel-release centos-release-scl -y && yum -y install jq patch
-RUN yum install gcc gcc-c++ curl unzip devtoolset-8-gcc devtoolset-8-gdb devtoolset-8-gcc-c++ devtoolset-8-binutils openssl-devel libpcap-devel perl-Digest-MD5 elfutils-libelf-devel-static glibc-static zlib-static git emacs-filesystem java-1.8.0-openjdk-devel dpdk dpdk-devel numactl numactl-devel numactl-libs -y && \
+RUN yum install gcc gcc-c++ curl unzip devtoolset-8-gcc devtoolset-8-gdb devtoolset-8-gcc-c++ devtoolset-8-binutils openssl-devel libpcap-devel perl-Digest-MD5 elfutils-libelf-devel-static glibc-static zlib-static git emacs-filesystem java-1.8.0-openjdk-devel dpdk dpdk-devel numactl numactl-devel numactl-libs protobuf-devel -y && \
     curl https://sh.rustup.rs -so rustup.sh; bash rustup.sh -y && \
     source /opt/rh/devtoolset-8/enable && \
     curl https://deepflow-ce.oss-cn-beijing.aliyuncs.com/pkg/compile/aarch64/musl-devel-1.2.2-el7.aarch64.rpm --silent -O && \

diff --git a/agent/docker/DockerfileToFix.build b/agent/docker/DockerfileToFix.build
@@ -12,7 +12,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
 RUN yum install make epel-release centos-release-scl -y && yum -y install jq patch
 
 # 安装基础依赖#
-RUN  yum install curl devtoolset-11-gcc devtoolset-11-gdb devtoolset-11-gcc-c++ devtoolset-11-binutils devtoolset-11-gcc* openssl-devel libpcap-devel perl-Digest-MD5 elfutils-libelf-devel-static glibc-static zlib-static git java-1.8.0-openjdk-devel dpdk dpdk-devel numactl numactl-devel numactl-libs -y && \
+RUN  yum install curl devtoolset-11-gcc devtoolset-11-gdb devtoolset-11-gcc-c++ devtoolset-11-binutils devtoolset-11-gcc* openssl-devel libpcap-devel perl-Digest-MD5 elfutils-libelf-devel-static glibc-static zlib-static git java-1.8.0-openjdk-devel dpdk dpdk-devel numactl numactl-devel numactl-libs protobuf-devel -y && \
      echo "source /opt/rh/devtoolset-11/enable" >> /etc/profile && \
      curl  https://sh.rustup.rs -so rustup.sh; bash rustup.sh -y
 RUN  curl https://deepflow-ce.oss-cn-beijing.aliyuncs.com/pkg/compile/x86_64/protoc --silent -O && chmod a+x protoc && mv protoc /usr/bin/ && whereis protoc && protoc --version && \