change to not curl blocked link for hashes

Author: madebyTimo

.github/workflows/build-release.yaml

@@ -32,7 +32,8 @@ jobs:
                   if (ls /media/saved-cache/*.tar.zst); then
                       docker run --pull always --rm \
                           --volume "/media/saved-cache:/media/saved-cache" \
-                          --volume "docker-monerod-build-cache:/media/build-cache" \
+                          --volume \
+                          "docker-monerod-build-cache:/media/build-cache" \
                           --workdir /media \
                           madebytimo/scripts \
                           compress.sh --decompress /media/saved-cache/*.tar.zst
@@ -54,7 +55,10 @@ jobs:
             - name: Prepare environment
               run: |
                   if [[ -f builder/docker.sh ]]; then
-                      docker buildx create --use
+                      curl --silent --location --output ~/buildkitd-gha.toml \
+                          "https://github.com/mbT-Infrastructure/template-config-files/raw/refs/\
+                  heads/main/debian/buildkit/buildkitd-gha.toml"
+                      docker buildx create --buildkitd-config ~/buildkitd-gha.toml --use
                   fi
             - name: Build
               if: ${{ github.event_name != 'schedule'}}
@@ -82,7 +86,8 @@ jobs:
               run: |
                   docker run --pull always --rm \
                       --volume "/media/saved-cache:/media/saved-cache" \
-                      --volume "docker-monerod-build-cache:/media/build-cache" \
+                      --volume \
+                      "docker-monerod-build-cache:/media/build-cache" \
                       madebytimo/scripts \
                       compress.sh --fast --output /media/saved-cache/build-cache /media/build-cache
                   sudo chown -R "$(whoami)" /media/saved-cache

Dockerfile

@@ -4,8 +4,9 @@ ARG TARGETPLATFORM
 
 WORKDIR /root/builder
 
+ADD https://web.getmonero.org/downloads/hashes.txt hashes.txt
 RUN download.sh https://raw.githubusercontent.com/monero-project/monero/refs/heads/master/utils/\
-gpg_keys/binaryfate.asc https://www.getmonero.org/downloads/hashes.txt \
+gpg_keys/binaryfate.asc \
     && gpg --keyring ./signature-public-keys.gpg --no-default-keyring --import binaryfate.asc \
     && rm binaryfate.asc \
     && gpg --keyring ./signature-public-keys.gpg --no-default-keyring --quiet \

Version.txt

@@ -1 +1 @@
-v0.1.1
+v0.1.2

builder/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 

builder/docker.sh

@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
-set -e
+set -e -o pipefail
 
 BUILD_ARGUMENTS=()
-DEPENDENCIES=(docker)
+BUILDER_EXPORT_ARCHIVE="${BUILDER_EXPORT_ARCHIVE:-true}"
+DEPENDENCIES=(docker zstd)
 UPDATE_BASE=false
-PLATFORMS=(amd64 arm64)
-REGISTRY_USER="madebytimo"
+PLATFORMS=(linux/amd64 linux/arm64)
+REGISTRY="docker.io/madebytimo"
+SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 APPLICATION_NAME="monerod"
 
 # help message
@@ -14,7 +16,7 @@ for ARGUMENT in "$@"; do
         echo "usage: $(basename "$0") [ARGUMENT]"
         echo "Builds the docker image from the Dockerfile."
         echo "ARGUMENT can be"
-        echo "--platform [amd64|arm64|arm] Build only for specified platform."
+        echo "--platform PLATFORM Build only for specified platform."
         echo "--publish Push the build."
         echo "--update-base Only build if newer base image is available."
         exit
@@ -42,32 +44,53 @@ while [[ -n "$1" ]]; do
     shift
 done
 
+IMAGE="${REGISTRY}/${APPLICATION_NAME}"
 PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
 VERSION="$(cat Version.txt)"
 
 cd "$PROJECT_DIR"
 mkdir --parents builds
 
-BASE_IMAGE="$(tac Dockerfile | grep --max-count=1 "^FROM" | cut -d" " -f2)"
-docker pull "$BASE_IMAGE"
-BASE_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$BASE_IMAGE" | cut -d "T" -f1)"
-echo "Base image is $BASE_IMAGE from $BASE_IMAGE_DATE"
-IMAGE="${REGISTRY_USER}/${APPLICATION_NAME}"
 if [[ "$UPDATE_BASE" == true ]]; then
+    BASE_IMAGE="$(tac Dockerfile | grep --max-count=1 "^FROM" | cut -d" " -f2)"
+    docker pull --quiet "$BASE_IMAGE"
+    BASE_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$BASE_IMAGE" \
+        | sed 's|^\([^T ]*\)[T ].*$|\1|')"
+    echo "Base image is $BASE_IMAGE from $BASE_IMAGE_DATE"
     docker pull "$IMAGE"
-    PUSHED_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$IMAGE" | cut -d "T" -f1)"
+    PUSHED_IMAGE_DATE="$(docker image inspect --format="{{ .Created }}" "$IMAGE" \
+        | sed 's|^\([^T ]*\)[T ].*$|\1|')"
     echo "Last pushed image is from $PUSHED_IMAGE_DATE"
     if [[ "$BASE_IMAGE_DATE" < "$PUSHED_IMAGE_DATE" ]]; then
         echo "Used base image is up to date"
         exit;
     fi
+    docker image rm "$IMAGE"
 fi
 
 PLATFORMS_STRING="${PLATFORMS[*]}"
 BUILD_ARGUMENTS+=(--platform "${PLATFORMS_STRING// /,}")
-OUTPUT_FILE="builds/${IMAGE//"/"/-}-${VERSION}-oci.tar"
+if [[ "$BUILDER_EXPORT_ARCHIVE" == true ]]; then
+    OUTPUT_FILE="builds/$(basename "$REGISTRY")-${APPLICATION_NAME}-${VERSION}-oci.tar"
+    BUILD_ARGUMENTS+=(--output \
+    "type=oci,dest=${OUTPUT_FILE},compression=zstd,compression-level=19,force-compression=true")
+fi
 
-docker buildx build "${BUILD_ARGUMENTS[@]}" --output \
-    "type=oci,dest=${OUTPUT_FILE},compression=zstd,compression-level=19,force-compression=true" \
+docker buildx build --pull "${BUILD_ARGUMENTS[@]}" \
     --tag "${IMAGE}:latest" --tag "${IMAGE}:${VERSION}" \
-    --tag "${IMAGE}:${VERSION}-base-${BASE_IMAGE_DATE}" .
+    --tag "${IMAGE}:${VERSION}-$(date "+%Y.%m.%d")" .
+
+if [[ "$BUILDER_EXPORT_ARCHIVE" == true ]]; then
+    docker pull --quiet quay.io/skopeo/stable > /dev/null
+    rm -f builds/.temp-docker-archive.tar
+    for PLATFORM in "${PLATFORMS[@]}"; do
+        docker run --interactive --network none --rm --volume "${PWD}/builds:/builds" \
+            quay.io/skopeo/stable copy --additional-tag "${IMAGE}:latest" --additional-tag \
+            "${IMAGE}:${VERSION}" --additional-tag "${IMAGE}:${VERSION}-$(date "+%Y.%m.%d")" \
+            --override-arch "${PLATFORM#*/}" --quiet "oci-archive:${OUTPUT_FILE}:latest" \
+            "docker-archive:builds/.temp-docker-archive.tar"
+        zstd -19 --force --quiet -T0 builds/.temp-docker-archive.tar \
+            -o "${OUTPUT_FILE%oci.tar}${PLATFORM#*/}.tar.zst"
+        rm -f builds/.temp-docker-archive.tar
+    done
+fi