Add Dockerfiles for amd64, arm64, and s390x architectures; update build process

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

.github/workflows/test.yml

@@ -301,7 +301,7 @@ jobs:
 
     - name: Build local Docker image
       if: ${{ startsWith(matrix.run_under, 'docker') }}
-      run: docker build --platform ${{ matrix.platform }} -f bazel/external/Dockerfile.bazel -t proxy-wasm/build-tools:local-ci .
+      run: docker build --platform ${{ matrix.platform }} -f bazel/external/Dockerfile.s390x -t proxy-wasm/build-tools:local-ci .
 
     - name: Bazel build/test
       shell: bash

bazel/external/Dockerfile.bazel bazel/external/Dockerfile.s390xbazel/external/Dockerfile.bazel renamed to bazel/external/Dockerfile.s390x

@@ -13,14 +13,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 # Prep:
 #   docker run --rm --privileged tonistiigi/binfmt --install all
 #   docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 #   Need to see "F" flag: cat /proc/sys/fs/binfmt_misc/qemu-*
 #
 # Build:
-#   docker buildx build --platform linux/s390x -t $IMAGE -f Dockerfile.bazel
+#   docker buildx build --platform linux/s390x -t $IMAGE -f Dockerfile.s390x
 #
 # Push:
 #   docker image tag $IMAGE ghcr.io/proxy-wasm/$IMAGE
@@ -33,8 +32,40 @@
 #     --define engine=null --config=clang --test_timeout=1800 \
 #     -- //test/...
 
-# Update base image
+ARG BAZELISK_VERSION=v1.27.0
 ARG UBUNTU_VERSION=24.04
+# Stage 1: builder for bazelisk on s390x
+FROM ubuntu:${UBUNTU_VERSION} AS bazelisk-builder
+SHELL ["/bin/bash", "-c"]
+WORKDIR /src
+ARG BAZELISK_VERSION
+ENV PATH="/usr/local/go/bin:$PATH"
+# Dépendances pour builder bazelisk
+ARG DEPS_BUILDER="\
+    build-essential \
+    ca-certificates \
+    git \
+    libc6-dev \
+    pkg-config \
+    tar \
+    wget\
+"
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $DEPS_BUILDER && \
+    wget --progress=dot:giga https://go.dev/dl/go1.24.0.linux-s390x.tar.gz && \
+    tar -C /usr/local -xzf go1.24.0.linux-s390x.tar.gz && \
+    rm go1.24.0.linux-s390x.tar.gz && \
+    git clone --branch "$BAZELISK_VERSION" --single-branch --depth 1 https://github.com/bazelbuild/bazelisk.git bazelisk
+WORKDIR /src/bazelisk
+RUN go build -o /bazelisk .
+WORKDIR /src
+RUN rm -rf /src/bazelisk /src/.git /usr/local/go/pkg /usr/local/go/doc /usr/local/go/api /usr/local/go/test /usr/local/go/misc /usr/local/go/obj /usr/local/go/src && \
+    apt-get remove --purge -y build-essential git wget && \
+    apt-get autoremove -y && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+# Stage 2: main build image
 FROM ubuntu:${UBUNTU_VERSION} AS build
 
 # Use bash for all RUN instructions
@@ -65,11 +96,9 @@ RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends $DEPS && \
     rm -rf /var/lib/apt/lists/*
 
-# Install bazelisk and set Bazel version
-ARG BAZELISK_VERSION=v1.27.0
-RUN curl -L -o /usr/local/bin/bazelisk "https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-linux-$(uname -m)" \
-    && chmod +x /usr/local/bin/bazelisk \
-    && ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel
+# Copy bazelisk from builder
+COPY --from=bazelisk-builder /bazelisk /usr/local/bin/bazelisk
+RUN ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel
 
 # Set a valid working directory
 WORKDIR /root