1.5.0

EdgeHttpDNS/build/build.sh

@@ -34,10 +34,14 @@ function build() {
 	mkdir -p "$DIST"/data
 
 	cp "$ROOT"/configs/api_httpdns.template.yaml "$DIST"/configs
-	copy_fluent_bit_assets "$ROOT" "$DIST" "$OS" "$ARCH" || exit 1
 
-	env GOOS="${OS}" GOARCH="${ARCH}" CGO_ENABLED=1 \
-		go build -trimpath -o "$DIST"/bin/${NAME} -ldflags="-s -w" "$ROOT"/../cmd/edge-httpdns/main.go
+	if [ "${OS}" = "linux" ]; then
+		env GOOS="${OS}" GOARCH="${ARCH}" CGO_ENABLED=0 \
+			go build -trimpath -o "$DIST"/bin/${NAME} -ldflags="-s -w" "$ROOT"/../cmd/edge-httpdns/main.go
+	else
+		env GOOS="${OS}" GOARCH="${ARCH}" CGO_ENABLED=1 \
+			go build -trimpath -o "$DIST"/bin/${NAME} -ldflags="-s -w" "$ROOT"/../cmd/edge-httpdns/main.go
+	fi
 
 	if [ ! -f "$DIST"/bin/${NAME} ]; then
 		echo "build failed!"
@@ -60,81 +64,6 @@ function build() {
 	echo "OK"
 }
 
-function copy_fluent_bit_assets() {
-	ROOT=$1
-	DIST=$2
-	OS=$3
-	ARCH=$4
-	FLUENT_ROOT="$ROOT/../../deploy/fluent-bit"
-	FLUENT_DIST="$DIST/deploy/fluent-bit"
-
-	if [ ! -d "$FLUENT_ROOT" ]; then
-		echo "[error] fluent-bit source directory not found: $FLUENT_ROOT"
-		return 1
-	fi
-	verify_fluent_bit_package_matrix "$FLUENT_ROOT" "$ARCH" || return 1
-
-	rm -rf "$FLUENT_DIST"
-	mkdir -p "$FLUENT_DIST"
-
-	for file in fluent-bit.conf fluent-bit-dns.conf fluent-bit-https.conf fluent-bit-dns-https.conf fluent-bit-windows.conf fluent-bit-windows-https.conf parsers.conf clickhouse-upstream.conf clickhouse-upstream-windows.conf README.md; do
-		if [ -f "$FLUENT_ROOT/$file" ]; then
-			cp "$FLUENT_ROOT/$file" "$FLUENT_DIST/"
-		fi
-	done
-
-	if [ "$OS" = "linux" ]; then
-		PACKAGE_SRC="$FLUENT_ROOT/packages/linux-$ARCH"
-		PACKAGE_DST="$FLUENT_DIST/packages/linux-$ARCH"
-		if [ -d "$PACKAGE_SRC" ]; then
-			mkdir -p "$PACKAGE_DST"
-			cp -R "$PACKAGE_SRC/." "$PACKAGE_DST/"
-		else
-			echo "[error] fluent-bit package directory not found: $PACKAGE_SRC"
-			return 1
-		fi
-	fi
-
-	rm -f "$FLUENT_DIST/.gitignore"
-	rm -f "$FLUENT_DIST"/logs.db*
-	rm -rf "$FLUENT_DIST/storage"
-
-	return 0
-}
-
-function verify_fluent_bit_package_matrix() {
-	FLUENT_ROOT=$1
-	ARCH=$2
-	REQUIRED_FILES=()
-	if [ "$ARCH" = "amd64" ]; then
-		REQUIRED_FILES=(
-			"packages/linux-amd64/fluent-bit_4.2.2_amd64.deb"
-			"packages/linux-amd64/fluent-bit-4.2.2-1.x86_64.rpm"
-		)
-	elif [ "$ARCH" = "arm64" ]; then
-		REQUIRED_FILES=(
-			"packages/linux-arm64/fluent-bit_4.2.2_arm64.deb"
-			"packages/linux-arm64/fluent-bit-4.2.2-1.aarch64.rpm"
-		)
-	else
-		echo "[error] unsupported arch for fluent-bit package validation: $ARCH"
-		return 1
-	fi
-
-	MISSING=0
-	for FILE in "${REQUIRED_FILES[@]}"; do
-		if [ ! -f "$FLUENT_ROOT/$FILE" ]; then
-			echo "[error] fluent-bit matrix package missing: $FLUENT_ROOT/$FILE"
-			MISSING=1
-		fi
-	done
-
-	if [ "$MISSING" -ne 0 ]; then
-		return 1
-	fi
-	return 0
-}
-
 function lookup-version() {
 	FILE=$1
 	VERSION_DATA=$(cat "$FILE")