scripts/utils/build-multiarch.sh

@@ -2,7 +2,8 @@
 PLATFORM=${PLATFORM:-"linux/amd64,linux/arm64/v8,linux/arm/v7"}
 
 docker buildx build \
-    --platform $PLATFORM \
-    $TAGS_ARG \
-    $EXTRA_ARGS \
-    $WORKDIR
+--platform $PLATFORM \
+--tag $TAG:latest \
+--tag "${TAG}:${VERSION}" \
+$EXTRA_ARGS \
+$WORKDIR

scripts/utils/build-ownarch.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 docker build \
-    $TAGS_ARG \
-    $EXTRA_ARGS \
-    "$WORKDIR"
+--tag $TAG:latest \
+--tag $TAG:$VERSION \
+$EXTRA_ARGS \
+"$WORKDIR"

scripts/utils/prepare.sh

@@ -24,56 +24,32 @@ fi
 cd "$repositoryFolder"
 
 if [ "$cloned" != True ]; then
-    # Checkout default-branch in case GIT_CHECKOUT was different
+    # Checkout default-branch in case GIT_CHECKOUT was different    
     defaultBranch=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
-    git checkout "${defaultBranch}"
+    git checkout "${defaultBranch}"     
 
-    git pull # Get changes
+    git pull        # Get changes
 fi
 
 # Checkout when set
 if [ "$GIT_CHECKOUT" != "" ]; then
     # Handle special directives
     if [ "$GIT_CHECKOUT" = "latest-tag" ]; then
-        GIT_CHECKOUT=$(git describe --tags $(git rev-list --tags --max-count=1)) # Get latest tag
+        GIT_CHECKOUT=$(git describe --tags `git rev-list --tags --max-count=1`)     # Get latest tag
     fi
 
     git checkout $GIT_CHECKOUT
 fi
 
+
 # --- VERSION ---
-# When not set
-if [ "$GIT_CHECKOUT" == "" ]; then
-    # Get current version to build
-    VERSION=$(git describe --tags --long)
-    if [ $? -ne 0 ]; then
-        VERSION=$(git rev-parse HEAD)
-    fi
-    export VERSION
+# Get current version to build
+VERSION=$(git describe --tags --long)
+if [ $? -ne 0 ]; then
+    VERSION=$(git rev-parse HEAD)
 fi
+export VERSION
 printf "Version: ${VERSION}\n"
 
-# --- TAGS ---
-IFS='-.' read -ra ADDR <<<"$VERSION"
-
-TAG_VERS=("latest")
-currentTag="${ADDR[0]}"
-TAG_VERS+=("$currentTag")
-
-for i in $(seq 1 $((${#ADDR[@]} - 1))); do
-    delimiter="."
-    if [[ $VERSION == *"${currentTag}-${ADDR[$i]}"* ]]; then
-        delimiter="-"
-    fi
-
-    currentTag="${currentTag}${delimiter}${ADDR[$i]}"
-    TAG_VERS+=("$currentTag")
-done
-
-# Generate TAG_VERS_ARG
-printf "TAG_VERS:\n"
-for tag_ver in "${TAG_VERS[@]}"; do
-    TAG="${TAGPREFIX}${NAME}:${tag_ver}"
-    TAGS_ARG="$TAGS_ARG --tag $TAG"
-    echo "- $TAG"
-done
+TAG=${TAG:-"${TAGPREFIX}${NAME}"}
+printf "> ${TAG}\n"

tools/bandwhich/Dockerfile

@@ -4,12 +4,14 @@ WORKDIR /app
 
 
 # ---- Build ----
-FROM rust:1.79.0-slim AS build
+FROM rust:1.65.0-slim AS build
 WORKDIR /build
+# Install packages
+RUN apt update && apt install -y make
 # Copy sources
 ADD .build/repository/ .
-# Compile
-RUN cargo build --release
+# Update dependencies and Compile
+RUN cargo update && TARGET="release" make
 
 
 # ---- Release ----

tools/synapse-compress-state/Dockerfile

@@ -29,4 +29,4 @@ FROM base AS release
 COPY --from=build-synapse_compress-state /build/target/release/synapse_compress_state .
 COPY --from=build-synapse_auto_compressor /build/target/release/synapse_auto_compressor .
 
-ENTRYPOINT ["./synapse_auto_compressor"]
+ENTRYPOINT ["./synapse_compress_state"]