Update protoc installation through github binaries (#5823)

Signed-off-by: Peter Zhu <[email protected]>

Author: peterzhuamazon

docker/ci/dockerfiles/current/build.al2.opensearch.x64.arm64.dockerfile

@@ -23,7 +23,7 @@ USER 0
 RUN yum clean all && \
     amazon-linux-extras install epel -y && \
     yum update -y && \
-    yum install -y which curl git gnupg2 tar net-tools procps-ng python3 python3-devel python3-pip zip unzip jq pigz protobuf-compiler
+    yum install -y which curl git gnupg2 tar net-tools procps-ng python3 python3-devel python3-pip zip unzip jq pigz
 
 # Create user group
 RUN groupadd -g 1000 $CONTAINER_USER && \
@@ -171,9 +171,9 @@ RUN pip3 install cmake==3.26.4
 # Only linux x64 glibc217 is supported in unofficial build until https://github.com/nodejs/unofficial-builds/pull/91 is merged for pre-compiled arm64 binaries
 # The linux arm64 glibc226 tarball here is directly compiled from the source code on AL2 host for the time being
 RUN if [ `uname -m` = "x86_64" ]; then \
-        curl -SL https://ci.opensearch.org/ci/dbc/tools/node/node-v20.18.0-linux-x64-glibc-217.tar.xz -o /node20.tar.xz; \
+        curl -SfL https://ci.opensearch.org/ci/dbc/tools/node/node-v20.18.0-linux-x64-glibc-217.tar.xz -o /node20.tar.xz; \
     else \
-        curl -SL https://ci.opensearch.org/ci/dbc/tools/node/node-v20.18.0-linux-arm64-glibc-226-libstdcpp-6.0.24.tar.xz -o /node20.tar.xz; \
+        curl -SfL https://ci.opensearch.org/ci/dbc/tools/node/node-v20.18.0-linux-arm64-glibc-226-libstdcpp-6.0.24.tar.xz -o /node20.tar.xz; \
     fi; \
     mkdir /node_al2 && \
     tar -xf /node20.tar.xz --strip-components 1 -C /node_al2 && \
@@ -186,7 +186,17 @@ WORKDIR $CONTAINER_USER_HOME
 # Install Rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y
 
+# Install protobuf
+RUN if [ "$(uname -m)" = "x86_64" ]; then \
+        curl -SfL https://github.com/protocolbuffers/protobuf/releases/download/v33.0/protoc-33.0-linux-x86_64.zip -o protoc.zip; \
+    else \
+        curl -Sfl https://github.com/protocolbuffers/protobuf/releases/download/v33.0/protoc-33.0-linux-aarch_64.zip -o protoc.zip; \
+    fi; \
+    unzip protoc.zip -d $CONTAINER_USER_HOME/.local && rm -v protoc.zip
+
 # Install fpm for opensearch dashboards core
 RUN gem install dotenv -v 2.8.1 && gem install public_suffix -v 5.1.1 && gem install rchardet -v 1.8.0 && gem install fpm -v 1.14.2
-ENV PATH=$CONTAINER_USER_HOME/.gem/gems/fpm-1.14.2/bin:$PATH
-RUN fpm -v
+
+# Setup ENV
+ENV PATH=$CONTAINER_USER_HOME/.gem/gems/fpm-1.14.2/bin:$CONTAINER_USER_HOME/.local/bin:$PATH
+RUN fpm -v && protoc --version

….opensearch.x64.arm64.ppc64le.dockerfile …malinux8.opensearch.x64.arm64.dockerfiledocker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile renamed to docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.dockerfile docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile renamed to docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.dockerfile

@@ -22,7 +22,7 @@ USER 0
 # Add normal dependencies
 RUN dnf clean all && dnf install -y 'dnf-command(config-manager)' && \
     dnf update -y && \
-    dnf install -y which curl git gnupg2 tar net-tools procps-ng python39 python39-devel python39-pip zip unzip jq protobuf-compiler
+    dnf install -y which curl git gnupg2 tar net-tools procps-ng python39 python39-devel python39-pip zip unzip jq
 
 # Replace default curl 7.61.1 on Almalinux8 with 7.75+ version to support aws-sigv4
 # https://github.com/curl/curl/commit/08e8455dddc5e48e58a12ade3815c01ae3da3b64
@@ -115,7 +115,17 @@ WORKDIR $CONTAINER_USER_HOME
 # Install Rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y
 
+# Install protobuf
+RUN if [ "$(uname -m)" = "x86_64" ]; then \
+        curl -SfL https://github.com/protocolbuffers/protobuf/releases/download/v33.0/protoc-33.0-linux-x86_64.zip -o protoc.zip; \
+    else \
+        curl -Sfl https://github.com/protocolbuffers/protobuf/releases/download/v33.0/protoc-33.0-linux-aarch_64.zip -o protoc.zip; \
+    fi; \
+    unzip protoc.zip -d $CONTAINER_USER_HOME/.local && rm -v protoc.zip
+
 # Install fpm for opensearch dashboards core
 RUN gem install dotenv -v 2.8.1 && gem install public_suffix -v 5.1.1 && gem install rchardet -v 1.8.0 && gem install fpm -v 1.14.2
-ENV PATH=$CONTAINER_USER_HOME/.gem/gems/fpm-1.14.2/bin:$PATH
-RUN fpm -v
+
+# Setup ENV
+ENV PATH=$CONTAINER_USER_HOME/.gem/gems/fpm-1.14.2/bin:$CONTAINER_USER_HOME/.local/bin:$PATH
+RUN fpm -v && protoc --version

docker/ci/dockerfiles/current/build.ubuntu2404.opensearch.x64.arm64.dockerfile

@@ -28,7 +28,7 @@ RUN apt-get update -y && apt-get install -y docker.io=24.0.7* curl build-essenti
     apt-get install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 xauth xvfb && \
     apt-get install -y libxrender1 libxi6 libxtst6 libasound2t64 && \
     apt-get install -y libatk1.0-0 libatk-bridge2.0-0 libcups2 libdrm2 libatspi2.0-dev libxcomposite-dev libxdamage1 libxfixes3 libxfixes-dev libxrandr2 libgbm-dev libxkbcommon-x11-0 libpangocairo-1.0-0 libcairo2 libcairo2-dev libnss3 libnspr4 libnspr4-dev && \
-    apt-get install -y mandoc less protobuf-compiler && \
+    apt-get install -y mandoc less && \
     apt-get clean -y
 
 # Docker Compose v2
@@ -80,7 +80,19 @@ RUN groupadd -g 1000 $CONTAINER_USER && \
 USER $CONTAINER_USER
 WORKDIR $CONTAINER_USER_HOME
 
+RUN aws --install
+
 # Install Rust
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --default-toolchain stable -y
 
-RUN aws --install
+# Install protobuf
+RUN if [ "$(uname -m)" = "x86_64" ]; then \
+        curl -SfL https://github.com/protocolbuffers/protobuf/releases/download/v33.0/protoc-33.0-linux-x86_64.zip -o protoc.zip; \
+    else \
+        curl -Sfl https://github.com/protocolbuffers/protobuf/releases/download/v33.0/protoc-33.0-linux-aarch_64.zip -o protoc.zip; \
+    fi; \
+    unzip protoc.zip -d $CONTAINER_USER_HOME/.local && rm -v protoc.zip
+
+# Setup ENV
+ENV PATH=$CONTAINER_USER_HOME/.local/bin:$PATH
+RUN protoc --version

…/feature-datafusion/opensearch-3.4.0.yml …/feature-datafusion/opensearch-3.3.0.ymlfeature-manifests/feature-datafusion/opensearch-3.4.0.yml renamed to feature-manifests/feature-datafusion/opensearch-3.3.0.yml feature-manifests/feature-datafusion/opensearch-3.4.0.yml renamed to feature-manifests/feature-datafusion/opensearch-3.3.0.yml

@@ -2,7 +2,7 @@
 schema-version: '1.2'
 build:
   name: OpenSearch
-  version: 3.4.0
+  version: 3.3.0
 ci:
   image:
     linux: