From 1fc8acb565c1ebd274de990fc09e6f476c5ca4d3 Mon Sep 17 00:00:00 2001
From: euzu <euzu@github.com>
Date: Fri, 14 Mar 2025 17:15:14 +0100
Subject: [PATCH] refactored docker build scripts

---
 bin/build_github_docker_aarch64.sh      | 43 +++++++++--
 bin/build_github_docker_aarch64_beta.sh | 73 -------------------
 bin/build_github_docker_beta.sh         | 94 +++++++++++++------------
 bin/build_resources.sh                  | 16 ++++-
 4 files changed, 99 insertions(+), 127 deletions(-)
 delete mode 100755 bin/build_github_docker_aarch64_beta.sh

diff --git a/bin/build_github_docker_aarch64.sh b/bin/build_github_docker_aarch64.sh
index ebef40283..2c43b79b2 100755
--- a/bin/build_github_docker_aarch64.sh
+++ b/bin/build_github_docker_aarch64.sh
@@ -1,7 +1,28 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
 source "${HOME}/.ghcr.io"
 
+# Function to print usage instructions
+print_usage() {
+    echo "Usage: $(basename "$0") [-r] [-h]"
+    echo
+    echo "Options:"
+    echo "  -r    Enable release image mode (default: false)"
+    echo "  -h    Display this help message"
+    exit 0
+}
+
+beta_image=true
+
+# parse options
+while getopts "rh" opt; do
+  case $opt in
+    r) beta_image=true ;;
+    h) print_usage ;;
+    \?) echo "Unknown option: -$OPTARG" >&2 ;;
+  esac
+done
+
 WORKING_DIR=$(pwd)
 BIN_DIR="${WORKING_DIR}/bin"
 RESOURCES_DIR="${WORKING_DIR}/resources"
@@ -14,11 +35,19 @@ if [ -z "${VERSION}" ]; then
     exit 1
 fi
 
+if [ "$beta_image" = true ]; then
+  # Split the version into its components using '.' as a delimiter
+  IFS='.' read -r major minor patch <<< "$VERSION"
+  # Increment the patch version
+  patch=$((patch + 1))
+  # Combine the components back into a version string
+  VERSION="$major.$minor.${patch}-beta"
+fi
+
 if [ ! -f "${BIN_DIR}/build_resources.sh" ]; then
   "${BIN_DIR}/build_resources.sh"
 fi
 
-
 cd "$FRONTEND_DIR" && rm -rf build && yarn  && yarn build
 cd "$WORKING_DIR"
 
@@ -37,19 +66,19 @@ if [ ! -f "${WORKING_DIR}/target/${TARGET}/release/m3u-filter" ]; then
     exit 1
 fi
 
-
 # Prepare Docker build context
 cp "${WORKING_DIR}/target/${TARGET}/release/m3u-filter" "${DOCKER_DIR}/"
 rm -rf "${DOCKER_DIR}/web"
 cp -r "${WORKING_DIR}/frontend/build" "${DOCKER_DIR}/web"
 cp -r "${RESOURCES_DIR}/freeze_frame.ts" "${DOCKER_DIR}/"
 
-# Get the version from the binary
-# VERSION=$(./m3u-filter -V | sed 's/m3u-filter *//')
-
 cd "${DOCKER_DIR}"
 echo "Building Docker images for version ${VERSION}"
-SCRATCH_IMAGE_NAME=m3u-filter-aarch64
+if [ "$beta_image" = true ]; then
+  SCRATCH_IMAGE_NAME=m3u-filter-aarch64-beta
+else
+  SCRATCH_IMAGE_NAME=m3u-filter-aarch64
+fi
 
 # Build scratch image and tag as "latest"
 docker build -f Dockerfile-manual -t ghcr.io/euzu/${SCRATCH_IMAGE_NAME}:"${VERSION}" --target scratch-final .
diff --git a/bin/build_github_docker_aarch64_beta.sh b/bin/build_github_docker_aarch64_beta.sh
deleted file mode 100755
index b40a122a3..000000000
--- a/bin/build_github_docker_aarch64_beta.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-source "${HOME}/.ghcr.io"
-
-WORKING_DIR=$(pwd)
-
-
-TARGET=aarch64-unknown-linux-musl
-
-(bin/build_fe.sh && bin/build_lin_static.sh $TARGET && bin/build_resources.sh ) || exit 1;
-
-# Check if the binary exists
-if [ ! -f "./target/${TARGET}/release/m3u-filter" ]; then
-    echo "Error: Static binary '../target/${TARGET}/release/m3u-filter' does not exist."
-    exit 1
-fi
-
-# Check if the frontend build directory exists
-if [ ! -d "./frontend/build" ]; then
-    echo "Error: Web directory '../frontend/build' does not exist."
-    exit 1
-fi
-
-if [ ! -f "./resources/freeze_frame.ts" ]; then
-    echo "Error: ./resources/freeze_frame.ts does not exist."
-    exit 1
-fi
-
-# Prepare Docker build context
-cd ./docker
-cp "../target/${TARGET}/release/m3u-filter" .
-rm -rf ./web
-cp -r ../frontend/build ./web
-cp -r ../resources/freeze_frame.ts .
-
-VERSION=$(grep '^version =' "${WORKING_DIR}/Cargo.toml" | sed -E 's/version = "(.*)"/\1/')
-if [ -z "${VERSION}" ]; then
-    echo "Error: Failed to determine the version."
-    exit 1
-fi
-
-# Split the version into its components using '.' as a delimiter
-IFS='.' read -r major minor patch <<< "$VERSION"
-
-# Increment the patch version
-patch=$((patch + 1))
-
-# Combine the components back into a version string
-VERSION="$major.$minor.${patch}-beta"
-
-IMAGE_NAME=m3u-filter-aarch64-beta
-
-echo "Building Docker images for version ${VERSION}"
-
-# Build beta image and tag as "latest"
-docker build -f Dockerfile-manual -t ghcr.io/euzu/${IMAGE_NAME}:"${VERSION}" --target scratch-final .
-docker tag ghcr.io/euzu/${IMAGE_NAME}:"${VERSION}" ghcr.io/euzu/${IMAGE_NAME}:latest
-
-echo "Logging into GitHub Container Registry..."
-docker login ghcr.io -u euzu -p "${GHCR_IO_TOKEN}"
-
-# Push beta
-docker push ghcr.io/euzu/${IMAGE_NAME}:"${VERSION}"
-docker push ghcr.io/euzu/${IMAGE_NAME}:latest
-
-# Clean up
-echo "Cleaning up build artifacts..."
-rm -rf ./web
-rm -f ./m3u-filter
-rm -f ./freeze_frame.ts
-
-echo "Docker images for version ${VERSION} have been successfully built, tagged, and pushed."
diff --git a/bin/build_github_docker_beta.sh b/bin/build_github_docker_beta.sh
index a17f2b879..c23252107 100755
--- a/bin/build_github_docker_beta.sh
+++ b/bin/build_github_docker_beta.sh
@@ -1,69 +1,73 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euo pipefail
-
 source "${HOME}/.ghcr.io"
 
+WORKING_DIR=$(pwd)
+BIN_DIR="${WORKING_DIR}/bin"
+RESOURCES_DIR="${WORKING_DIR}/resources"
+DOCKER_DIR="${WORKING_DIR}/docker"
+FRONTEND_DIR="${WORKING_DIR}/frontend"
 TARGET=x86_64-unknown-linux-musl
-
-(bin/build_fe.sh && bin/build_lin_static.sh && bin/build_resources.sh ) || exit 1;
-
-# Check if the binary exists
-if [ ! -f "./target/${TARGET}/release/m3u-filter" ]; then
-    echo "Error: Static binary '../target/${TARGET}/release/m3u-filter' does not exist."
-    exit 1
-fi
-
-# Check if the frontend build directory exists
-if [ ! -d "./frontend/build" ]; then
-    echo "Error: Web directory '../frontend/build' does not exist."
-    exit 1
-fi
-
-if [ ! -f "./resources/freeze_frame.ts" ]; then
-    echo "Error: ./resources/freeze_frame.ts does not exist."
-    exit 1
-fi
-
-# Prepare Docker build context
-cd ./docker
-cp "../target/${TARGET}/release/m3u-filter" .
-rm -rf ./web
-cp -r ../frontend/build ./web
-cp -r ../resources/freeze_frame.ts .
-
-# Get the version from the binary
-VERSION=$(./m3u-filter -V | sed 's/m3u-filter *//')
+VERSION=$(grep -Po '^version\s*=\s*"\K[0-9\.]+' Cargo.toml)
 if [ -z "${VERSION}" ]; then
-    echo "Error: Failed to determine the version from the binary."
+    echo "Error: Failed to determine the version from Cargo.toml."
     exit 1
 fi
 
 # Split the version into its components using '.' as a delimiter
 IFS='.' read -r major minor patch <<< "$VERSION"
-
 # Increment the patch version
 patch=$((patch + 1))
-
 # Combine the components back into a version string
 VERSION="$major.$minor.${patch}-beta"
 
-echo "Building Docker images for version ${VERSION}"
+if [ ! -f "${BIN_DIR}/build_resources.sh" ]; then
+  "${BIN_DIR}/build_resources.sh"
+fi
 
-# Build beta image and tag as "latest"
-docker build -f Dockerfile-manual -t ghcr.io/euzu/m3u-filter-beta:"${VERSION}" --target scratch-final .
-docker tag ghcr.io/euzu/m3u-filter-beta:"${VERSION}" ghcr.io/euzu/m3u-filter-beta:latest
+cd "$FRONTEND_DIR" && rm -rf build && yarn  && yarn build
+cd "$WORKING_DIR"
+
+# Check if the frontend build directory exists
+if [ ! -d "$FRONTEND_DIR/build" ]; then
+    echo "Error: Web directory '$FRONTEND_DIR/build' does not exist."
+    exit 1
+fi
+
+cargo clean
+env RUSTFLAGS="--remap-path-prefix $HOME=~" cross build --release --target "$TARGET"
+
+# Check if the binary exists
+if [ ! -f "${WORKING_DIR}/target/${TARGET}/release/m3u-filter" ]; then
+    echo "Error: Static binary '${WORKING_DIR}/target/${TARGET}/release/m3u-filter' does not exist."
+    exit 1
+fi
+
+# Prepare Docker build context
+cp "${WORKING_DIR}/target/${TARGET}/release/m3u-filter" "${DOCKER_DIR}/"
+rm -rf "${DOCKER_DIR}/web"
+cp -r "${WORKING_DIR}/frontend/build" "${DOCKER_DIR}/web"
+cp -r "${RESOURCES_DIR}/freeze_frame.ts" "${DOCKER_DIR}/"
+
+cd "${DOCKER_DIR}"
+echo "Building Docker images for version ${VERSION}"
+SCRATCH_IMAGE_NAME=m3u-filter-beta
+
+# Build scratch image and tag as "latest"
+docker build -f Dockerfile-manual -t ghcr.io/euzu/${SCRATCH_IMAGE_NAME}:"${VERSION}" --target scratch-final .
+docker tag ghcr.io/euzu/${SCRATCH_IMAGE_NAME}:"${VERSION}" ghcr.io/euzu/${SCRATCH_IMAGE_NAME}:latest
 
 echo "Logging into GitHub Container Registry..."
 docker login ghcr.io -u euzu -p "${GHCR_IO_TOKEN}"
 
-# Push beta
-docker push ghcr.io/euzu/m3u-filter-beta:"${VERSION}"
-docker push ghcr.io/euzu/m3u-filter-beta:latest
+# Push scratch
+docker push ghcr.io/euzu/${SCRATCH_IMAGE_NAME}:"${VERSION}"
+docker push ghcr.io/euzu/${SCRATCH_IMAGE_NAME}:latest
 
 # Clean up
 echo "Cleaning up build artifacts..."
-rm -rf ./web
-rm -f ./m3u-filter
-rm -f ./freeze_frame.ts
+rm -rf "${DOCKER_DIR}/web"
+rm -f "${DOCKER_DIR}/m3u-filter"
+rm -f "${DOCKER_DIR}/freeze_frame.ts"
 
-echo "Docker images for version ${VERSION} have been successfully built, tagged, and pushed."
+echo "Docker images ghcr.io/euzu/${SCRATCH_IMAGE_NAME}${VERSION} have been successfully built, tagged, and pushed."
diff --git a/bin/build_resources.sh b/bin/build_resources.sh
index 60421e7ad..8011a2391 100755
--- a/bin/build_resources.sh
+++ b/bin/build_resources.sh
@@ -1,11 +1,23 @@
 #!/usr/bin/env bash
 
+
+# Function to print usage instructions
+print_usage() {
+    echo "Usage: $(basename "$0") [-f] [-h]"
+    echo
+    echo "Options:"
+    echo "  -f    Force resource creation"
+    echo "  -h    Display this help message"
+    exit 0
+}
+
 flag_force=false
 
-# Optionen parsen
-while getopts "f" opt; do
+# parse options
+while getopts "fh" opt; do
   case $opt in
     f) flag_force=true ;;
+    h) print_usage ;;
     \?) echo "Unknown option: -$OPTARG" >&2 ;;
   esac
 done