Add stable / edge
This commit is contained in:
@@ -25,8 +25,9 @@ setup_qemu() {
|
||||
build_docker_image() {
|
||||
local build_dir="$1"
|
||||
local arch="${2:-x86_64}"
|
||||
local mirror="${3:-edge}"
|
||||
local platform=""
|
||||
local image_tag="omarchy-pkg-builder:latest-$arch"
|
||||
local image_tag="omarchy-pkg-builder:latest-$arch-$mirror"
|
||||
|
||||
case "$arch" in
|
||||
x86_64) platform="linux/amd64" ;;
|
||||
@@ -37,10 +38,11 @@ build_docker_image() {
|
||||
;;
|
||||
esac
|
||||
|
||||
print_info "Building Docker image for $arch ($platform)..."
|
||||
print_info "Building Docker image for $arch ($platform) using $mirror mirror..."
|
||||
|
||||
docker buildx build \
|
||||
--platform "$platform" \
|
||||
--build-arg MIRROR="$mirror" \
|
||||
--load \
|
||||
-t "$image_tag" \
|
||||
-f "$build_dir/Dockerfile" \
|
||||
|
||||
+7
-6
@@ -1,8 +1,9 @@
|
||||
# Common path variables for Omarchy package build system
|
||||
# This file should be sourced after setting BUILD_ROOT
|
||||
|
||||
# Default architecture
|
||||
# Default architecture and mirror
|
||||
ARCH=${ARCH:-x86_64}
|
||||
MIRROR=${MIRROR:-edge}
|
||||
|
||||
# Core directories (architecture-independent)
|
||||
BUILD_DIR="$BUILD_ROOT/build"
|
||||
@@ -10,12 +11,12 @@ SRC_DIR="$BUILD_ROOT/src"
|
||||
LOG_DIR="$BUILD_ROOT/logs"
|
||||
PKGBUILDS_DIR="$BUILD_ROOT/pkgbuilds"
|
||||
|
||||
# Function to update architecture-specific paths
|
||||
# Call this after changing ARCH variable
|
||||
# Function to update architecture and mirror-specific paths
|
||||
# Call this after changing ARCH or MIRROR variables
|
||||
update_arch_paths() {
|
||||
BUILD_OUTPUT_DIR="$BUILD_ROOT/build-output/$ARCH" # Unsigned packages
|
||||
REPO_DIR="$BUILD_ROOT/pkgs.omarchy.org/$ARCH" # Repository (signed packages)
|
||||
BUILD_OUTPUT_DIR="$BUILD_ROOT/build-output/$MIRROR/$ARCH" # Unsigned packages
|
||||
REPO_DIR="$BUILD_ROOT/pkgs.omarchy.org/$MIRROR/$ARCH" # Repository (signed packages)
|
||||
}
|
||||
|
||||
# Initialize architecture-specific directories with default ARCH
|
||||
# Initialize architecture-specific directories with default ARCH and MIRROR
|
||||
update_arch_paths
|
||||
|
||||
Reference in New Issue
Block a user