Update workflow

RokibulHasan7 · RokibulHasan7 · commit 1d6f879674b2 · 2026-01-02T23:35:21.000+06:00
diff --git a/.github/workflows/build-&-publish-docker-image.yml b/.github/workflows/build-&-publish-docker-image.yml
@@ -22,7 +22,7 @@ env:
 jobs:
   blobber:
     timeout-minutes: 30
-    runs-on: [blobber-runner]
+    runs-on: [hetzner-build]
     steps:
       - name: Cleanup before restarting conductor tests.
         run: |
@@ -95,19 +95,16 @@ jobs:
           SHORT_SHA=$(echo ${{ env.SHA }} | head -c 8)
           export DOCKER_IMAGE_BASE="$BLOBBER_BUILD_BASE_REGISTRY:$TAG"
           export DOCKER_IMAGE_SWAGGER="${BLOBBER_REGISTRY}:swagger_test"
-          # export DOCKER_BUILD="buildx build --platform linux/amd64,linux/arm64 --push"
-          export DOCKER_BUILD="build --push"
+          export DOCKER_BUILD="build"
           export DOCKER_IMAGE_BLOBBER="-t ${BLOBBER_REGISTRY}:${TAG}"
-          export CONTEXT_NAME="$RUNNER_NAME" && (docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1 || docker context create "$CONTEXT_NAME")
-          docker buildx inspect "blobber-$RUNNER_NAME" || docker buildx create --name "blobber-$RUNNER_NAME" --driver-opt network=host --buildkitd-flags '--allow-insecure-entitlement security.insecure' "$CONTEXT_NAME"
-          docker buildx use "blobber-$RUNNER_NAME"
           ./docker.local/bin/build.blobber.sh
           docker tag ${BLOBBER_REGISTRY}:${TAG} ${BLOBBER_REGISTRY}:${TAG}-${SHORT_SHA}
+          docker push ${BLOBBER_REGISTRY}:${TAG}
           docker push ${BLOBBER_REGISTRY}:${TAG}-${SHORT_SHA}
 
   validator:
     timeout-minutes: 30
-    runs-on: [blobber-runner]
+    runs-on: [hetzner-build]
     steps:
       - name: Cleanup before restarting conductor tests.
         run: |
@@ -181,20 +178,17 @@ jobs:
           docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }}
           SHORT_SHA=$(echo ${{ env.SHA }} | head -c 8)
           export DOCKER_IMAGE_BASE="$BLOBBER_BUILD_BASE_REGISTRY:$TAG"
-          # export DOCKER_BUILD="buildx build --platform linux/amd64,linux/arm64 --push"
-          export DOCKER_BUILD="build --push"
+          export DOCKER_BUILD="build"
           export DOCKER_IMAGE_VALIDATOR="-t ${VALIDATOR_REGISTRY}:${TAG}"
-          export CONTEXT_NAME="$RUNNER_NAME" && (docker context inspect "$CONTEXT_NAME" >/dev/null 2>&1 || docker context create "$CONTEXT_NAME")
-          docker buildx inspect "validator-$RUNNER_NAME" || docker buildx create --name "validator-$RUNNER_NAME" --driver-opt network=host --buildkitd-flags '--allow-insecure-entitlement security.insecure' "$CONTEXT_NAME"
-          docker buildx use "validator-$RUNNER_NAME"
           ./docker.local/bin/build.validator.sh
           docker tag ${VALIDATOR_REGISTRY}:${TAG} ${VALIDATOR_REGISTRY}:${TAG}-${SHORT_SHA}
+          docker push ${VALIDATOR_REGISTRY}:${TAG}
           docker push ${VALIDATOR_REGISTRY}:${TAG}-${SHORT_SHA}
 
   system-tests:
     if: github.event_name != 'workflow_dispatch'
     needs: [blobber, validator]
-    runs-on: [ tests-suite ]
+    runs-on: [ hetzner-testsuite ]
     steps:
       - name: "Get current PR"
         uses: jwalton/gh-find-current-pr@v1
diff --git a/docker.local/base.Dockerfile b/docker.local/base.Dockerfile
@@ -2,11 +2,46 @@ FROM golang:1.22.0-alpine3.18 as blobber_base
 
 LABEL zchain="blobber"
 
-RUN  apk add --update --no-cache linux-headers build-base git cmake bash perl grep
+RUN apk add --update --no-cache linux-headers build-base git cmake bash perl grep
 
 # Install Herumi's cryptography
 WORKDIR /tmp
 
 RUN apk upgrade
 RUN apk del libstdc++ gmp-dev openssl-dev vips-dev
-RUN apk add --update --no-cache libstdc++ gmp-dev openssl-dev vips-dev
+RUN apk add --update --no-cache libstdc++ gmp-dev openssl-dev vips-dev
+
+# Copy the herumi library tarballs (downloaded by build.base.sh)
+COPY docker.local/bin/mcl.tar.gz /tmp/
+COPY docker.local/bin/bls.tar.gz /tmp/
+
+# Extract both archives first
+RUN tar -xzf mcl.tar.gz && \
+    tar -xzf bls.tar.gz
+
+# Build and install mcl
+RUN cd mcl-* && \
+    mkdir -p build && \
+    cd build && \
+    cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+    make -j$(nproc) && \
+    make install
+
+# Build and install bls (copy mcl source into bls directory)
+RUN BLS_DIR=$(ls -d /tmp/bls-* | head -n 1) && \
+    MCL_DIR=$(ls -d /tmp/mcl-* | head -n 1) && \
+    cp -r "$MCL_DIR" "$BLS_DIR/mcl" && \
+    cd "$BLS_DIR" && \
+    mkdir -p build && \
+    cd build && \
+    cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. && \
+    make -j$(nproc) && \
+    make install
+
+# Clean up
+RUN cd /tmp && \
+    rm -rf mcl-* bls-* mcl.tar.gz bls.tar.gz
+
+# Verify libraries are installed
+RUN ls -la /usr/local/lib/libmcl* /usr/local/lib/libbls* && \
+    echo "Herumi libraries successfully installed"
diff --git a/docker.local/bin/build.base.sh b/docker.local/bin/build.base.sh
@@ -27,4 +27,11 @@ echo "2> download herumi"
 [ ! -f ./docker.local/bin/bls.tar.gz ] && wget -O ./docker.local/bin/bls.tar.gz https://github.com/herumi/bls/archive/refs/tags/v1.22.tar.gz
 
 echo "3> docker build"
-DOCKER_BUILDKIT=1 docker $DOCKER_BUILD --progress=plain --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/base.Dockerfile . -t $DOCKER_IMAGE_BASE --network host
+# Set progress flag only for buildx
+if [[ "$DOCKER_BUILD" == *"buildx"* ]]; then
+    PROGRESS_FLAG="--progress=plain"
+else
+    PROGRESS_FLAG=""
+fi
+
+docker $DOCKER_BUILD $PROGRESS_FLAG --build-arg GIT_COMMIT=$GIT_COMMIT -f docker.local/base.Dockerfile . -t $DOCKER_IMAGE_BASE --network host
diff --git a/docker.local/bin/build.blobber.sh b/docker.local/bin/build.blobber.sh
@@ -7,7 +7,6 @@ echo $GIT_COMMIT
 echo "1> set DOCKER_IMAGE & DOCKER_BUILD"
 if [ -z "$DOCKER_BUILD" ]; then
     if [ "x86_64" != "$(uname -m)" ]; then
-        #docker buildx use blobber_buildx || docker buildx create --name blobber_buildx --use
         DOCKER_BUILD="buildx build --platform linux/arm64"
     else
         DOCKER_BUILD="build"
@@ -28,9 +27,14 @@ echo "  DOCKER_IMAGE_SWAGGER=$DOCKER_IMAGE_SWAGGER"
 echo "  DOCKER_IMAGE_BLOBBER=$DOCKER_IMAGE_BLOBBER"
 
 echo ""
+echo "2> docker build blobber"
 
-# echo "generating swagger"
-# docker.local/bin/test.swagger.sh
+# Set flags based on build type
+if [[ "$DOCKER_BUILD" == *"buildx"* ]]; then
+    BUILD_FLAGS="--progress=plain"
+    export DOCKER_BUILDKIT=1
+else
+    BUILD_FLAGS=""
+fi
 
-echo "2> docker build blobber"
-DOCKER_BUILDKIT=1 docker $DOCKER_BUILD --progress=plain --build-arg GIT_COMMIT=$GIT_COMMIT --build-arg DOCKER_IMAGE_BASE=$DOCKER_IMAGE_BASE -f docker.local/blobber.Dockerfile . $DOCKER_IMAGE_BLOBBER  --network host
+docker $DOCKER_BUILD $BUILD_FLAGS --build-arg GIT_COMMIT=$GIT_COMMIT --build-arg DOCKER_IMAGE_BASE=$DOCKER_IMAGE_BASE -f docker.local/blobber.Dockerfile . $DOCKER_IMAGE_BLOBBER --network host
diff --git a/docker.local/bin/build.validator.sh b/docker.local/bin/build.validator.sh
@@ -7,18 +7,17 @@ echo $GIT_COMMIT
 echo "1> set DOCKER_IMAGE & DOCKER_BUILD"
 if [ -z "$DOCKER_BUILD" ]; then  
     if [ "x86_64" != "$(uname -m)" ]; then
-        #docker buildx use blobber_buildx || docker buildx create --name blobber_buildx --use
         DOCKER_BUILD="buildx build --platform linux/arm64"
     else
         DOCKER_BUILD="build"
     fi
 fi
 
-if [ -z "$DOCKER_IMAGE_BASE" ]; then  
+if [ -z "$DOCKER_IMAGE_BASE" ]; then
     DOCKER_IMAGE_BASE="blobber_base"
 fi
 
-if [ -z "$DOCKER_IMAGE_VALIDATOR" ]; then  
+if [ -z "$DOCKER_IMAGE_VALIDATOR" ]; then
     DOCKER_IMAGE_VALIDATOR="-t validator"
 fi
 
@@ -28,4 +27,13 @@ echo "  DOCKER_IMAGE_VALIDATOR=$DOCKER_IMAGE_VALIDATOR"
 
 echo ""
 echo "2> docker build validator"
-DOCKER_BUILDKIT=1 docker $DOCKER_BUILD --progress=plain --build-arg GIT_COMMIT=$GIT_COMMIT --build-arg DOCKER_IMAGE_BASE=$DOCKER_IMAGE_BASE -f docker.local/validator.Dockerfile . $DOCKER_IMAGE_VALIDATOR
+
+# Set flags based on build type
+if [[ "$DOCKER_BUILD" == *"buildx"* ]]; then
+    BUILD_FLAGS="--progress=plain"
+    export DOCKER_BUILDKIT=1
+else
+    BUILD_FLAGS=""
+fi
+
+docker $DOCKER_BUILD $BUILD_FLAGS --build-arg GIT_COMMIT=$GIT_COMMIT --build-arg DOCKER_IMAGE_BASE=$DOCKER_IMAGE_BASE -f docker.local/validator.Dockerfile . $DOCKER_IMAGE_VALIDATOR
diff --git a/docker.local/blobber.Dockerfile b/docker.local/blobber.Dockerfile
@@ -1,6 +1,12 @@
 # syntax=docker/dockerfile:1
+
+# Declare ARG at the top, before any FROM
 ARG DOCKER_IMAGE_BASE
-FROM $DOCKER_IMAGE_BASE  as blobber_build
+
+# Create a named stage from the base image
+FROM $DOCKER_IMAGE_BASE as base_image
+
+FROM $DOCKER_IMAGE_BASE as blobber_build
 LABEL zchain="blobber"
 
 ENV SRC_DIR=/0chain
@@ -25,11 +31,12 @@ FROM alpine:3.18
 
 RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main libstdc++ gmp openssl vips
 
-COPY --from=blobber_build  /usr/local/lib/libmcl*.so \
-                        /usr/local/lib/libbls*.so \
-                        /usr/local/lib/
+# Copy from the named base_image stage
+COPY --from=base_image /usr/local/lib/libmcl*.so \
+                       /usr/local/lib/libbls*.so \
+                       /usr/local/lib/
 
 ENV APP_DIR=/blobber
 WORKDIR $APP_DIR
 COPY --from=blobber_build /0chain/code/go/0chain.net/blobber/blobber $APP_DIR/bin/blobber
-# COPY ./code/go/0chain.net/swagger.yaml /docs/swagger.yaml
+# COPY ./code/go/0chain.net/swagger.yaml /docs/swagger.yaml
diff --git a/docker.local/validator.Dockerfile b/docker.local/validator.Dockerfile
@@ -1,21 +1,22 @@
 # syntax=docker/dockerfile:1
+
+# Declare ARG at the top, before any FROM
 ARG DOCKER_IMAGE_BASE
-FROM $DOCKER_IMAGE_BASE as validator_build
 
-LABEL zchain="validator"
+# Create a named stage from the base image
+FROM $DOCKER_IMAGE_BASE as base_image
 
+FROM $DOCKER_IMAGE_BASE as validator_build
+LABEL zchain="validator"
 
 ENV SRC_DIR=/0chain
 ENV GO111MODULE=on
-#ENV GOPROXY=https://goproxy.cn,direct 
-
 
 # Download the dependencies:
 # Will be cached if we don't change mod/sum files
 COPY .  $SRC_DIR
-# COPY ./gosdk  /gosdk
 
-RUN cd $SRC_DIR/ && go mod download 
+RUN cd $SRC_DIR/ && go mod download
 
 WORKDIR $SRC_DIR/code/go/0chain.net/validator
 ARG GIT_COMMIT
@@ -27,9 +28,11 @@ FROM alpine:3.18
 
 RUN apk add --update --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/main libstdc++ gmp openssl vips
 
-COPY --from=validator_build  /usr/local/lib/libmcl*.so \
-                        /usr/local/lib/libbls*.so \
-                        /usr/local/lib/
+# Copy from the named base_image stage
+COPY --from=base_image /usr/local/lib/libmcl*.so \
+                       /usr/local/lib/libbls*.so \
+                       /usr/local/lib/
+
 ENV APP_DIR=/validator
 WORKDIR $APP_DIR
 COPY --from=validator_build /0chain/code/go/0chain.net/validator/validator $APP_DIR/bin/validator
