Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-07-14 20:48:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: add .gitattributes to enforce LF line endings for shell scripts

Browse Source 
Docker containers crash on startup when shell scripts have CRLF line
endings (from Windows git checkout with core.autocrlf=true). The
start.sh gunicorn entrypoint fails with "$'\r': command not found".

Add .gitattributes forcing eol=lf for *.sh and Dockerfile so Docker
builds work regardless of the developer's git line ending config.
Also normalizes two scripts that were committed with CRLF.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
ribs
2026-02-28 14:24:03 -08:00
parent e58cfb5679
commit a453593b7b
3 changed files with 172 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+3
View File
@@ -0,0 +1,3 @@
# Force LF line endings for files that must run on Linux (Docker)
*.sh text eol=lf
Dockerfile text eol=lf
build-multiarch.sh
+139 -139
View File
@@ -1,139 +1,139 @@
#!/bin/bash #!/bin/bash
# INTERCEPT - Multi-architecture Docker image builder # INTERCEPT - Multi-architecture Docker image builder
# #
# Builds for both linux/amd64 and linux/arm64 using Docker buildx. # Builds for both linux/amd64 and linux/arm64 using Docker buildx.
# Run this on your x64 machine to cross-compile the arm64 image # Run this on your x64 machine to cross-compile the arm64 image
# instead of building natively on the RPi5. # instead of building natively on the RPi5.
# #
# Prerequisites (one-time setup): # Prerequisites (one-time setup):
# docker run --privileged --rm tonistiigi/binfmt --install all # docker run --privileged --rm tonistiigi/binfmt --install all
# docker buildx create --name intercept-builder --use --bootstrap # docker buildx create --name intercept-builder --use --bootstrap
# #
# Usage: # Usage:
# ./build-multiarch.sh # Build both platforms, load locally # ./build-multiarch.sh # Build both platforms, load locally
# ./build-multiarch.sh --push # Build and push to registry # ./build-multiarch.sh --push # Build and push to registry
# ./build-multiarch.sh --arm64-only # Build arm64 only (for RPi) # ./build-multiarch.sh --arm64-only # Build arm64 only (for RPi)
# REGISTRY=ghcr.io/user ./build-multiarch.sh --push # REGISTRY=ghcr.io/user ./build-multiarch.sh --push
# #
# Environment variables: # Environment variables:
# REGISTRY - Container registry (default: docker.io/library) # REGISTRY - Container registry (default: docker.io/library)
# IMAGE_NAME - Image name (default: intercept) # IMAGE_NAME - Image name (default: intercept)
# IMAGE_TAG - Image tag (default: latest) # IMAGE_TAG - Image tag (default: latest)
set -euo pipefail set -euo pipefail
# Configuration # Configuration
REGISTRY="${REGISTRY:-}" REGISTRY="${REGISTRY:-}"
IMAGE_NAME="${IMAGE_NAME:-intercept}" IMAGE_NAME="${IMAGE_NAME:-intercept}"
IMAGE_TAG="${IMAGE_TAG:-latest}" IMAGE_TAG="${IMAGE_TAG:-latest}"
BUILDER_NAME="intercept-builder" BUILDER_NAME="intercept-builder"
PLATFORMS="linux/amd64,linux/arm64" PLATFORMS="linux/amd64,linux/arm64"
# Parse arguments # Parse arguments
PUSH=false PUSH=false
LOAD=false LOAD=false
ARM64_ONLY=false ARM64_ONLY=false
for arg in "$@"; do for arg in "$@"; do
case $arg in case $arg in
--push) PUSH=true ;; --push) PUSH=true ;;
--load) LOAD=true ;; --load) LOAD=true ;;
--arm64-only) --arm64-only)
ARM64_ONLY=true ARM64_ONLY=true
PLATFORMS="linux/arm64" PLATFORMS="linux/arm64"
;; ;;
--amd64-only) --amd64-only)
PLATFORMS="linux/amd64" PLATFORMS="linux/amd64"
;; ;;
--help|-h) --help|-h)
echo "Usage: $0 [--push] [--load] [--arm64-only] [--amd64-only]" echo "Usage: $0 [--push] [--load] [--arm64-only] [--amd64-only]"
echo "" echo ""
echo "Options:" echo "Options:"
echo " --push Push to container registry" echo " --push Push to container registry"
echo " --load Load into local Docker (single platform only)" echo " --load Load into local Docker (single platform only)"
echo " --arm64-only Build arm64 only (for RPi5 deployment)" echo " --arm64-only Build arm64 only (for RPi5 deployment)"
echo " --amd64-only Build amd64 only" echo " --amd64-only Build amd64 only"
echo "" echo ""
echo "Environment variables:" echo "Environment variables:"
echo " REGISTRY Container registry (e.g. ghcr.io/username)" echo " REGISTRY Container registry (e.g. ghcr.io/username)"
echo " IMAGE_NAME Image name (default: intercept)" echo " IMAGE_NAME Image name (default: intercept)"
echo " IMAGE_TAG Image tag (default: latest)" echo " IMAGE_TAG Image tag (default: latest)"
echo "" echo ""
echo "Examples:" echo "Examples:"
echo " $0 --push # Build both, push" echo " $0 --push # Build both, push"
echo " REGISTRY=ghcr.io/myuser $0 --push # Push to GHCR" echo " REGISTRY=ghcr.io/myuser $0 --push # Push to GHCR"
echo " $0 --arm64-only --load # Build arm64, load locally" echo " $0 --arm64-only --load # Build arm64, load locally"
echo " $0 --arm64-only --push && ssh rpi docker pull # Build + deploy to RPi" echo " $0 --arm64-only --push && ssh rpi docker pull # Build + deploy to RPi"
exit 0 exit 0
;; ;;
*) *)
echo "Unknown option: $arg" echo "Unknown option: $arg"
exit 1 exit 1
;; ;;
esac esac
done done
# Build full image reference # Build full image reference
if [ -n "$REGISTRY" ]; then if [ -n "$REGISTRY" ]; then
FULL_IMAGE="${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}" FULL_IMAGE="${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}"
else else
FULL_IMAGE="${IMAGE_NAME}:${IMAGE_TAG}" FULL_IMAGE="${IMAGE_NAME}:${IMAGE_TAG}"
fi fi
echo "============================================" echo "============================================"
echo " INTERCEPT Multi-Architecture Builder" echo " INTERCEPT Multi-Architecture Builder"
echo "============================================" echo "============================================"
echo " Image: ${FULL_IMAGE}" echo " Image: ${FULL_IMAGE}"
echo " Platforms: ${PLATFORMS}" echo " Platforms: ${PLATFORMS}"
echo " Push: ${PUSH}" echo " Push: ${PUSH}"
echo "============================================" echo "============================================"
echo "" echo ""
# Check if buildx builder exists, create if not # Check if buildx builder exists, create if not
if ! docker buildx inspect "$BUILDER_NAME" >/dev/null 2>&1; then if ! docker buildx inspect "$BUILDER_NAME" >/dev/null 2>&1; then
echo "Creating buildx builder: ${BUILDER_NAME}" echo "Creating buildx builder: ${BUILDER_NAME}"
docker buildx create --name "$BUILDER_NAME" --use --bootstrap docker buildx create --name "$BUILDER_NAME" --use --bootstrap
# Check for QEMU support # Check for QEMU support
if ! docker run --rm --privileged tonistiigi/binfmt --install all >/dev/null 2>&1; then if ! docker run --rm --privileged tonistiigi/binfmt --install all >/dev/null 2>&1; then
echo "WARNING: QEMU binfmt setup may have failed." echo "WARNING: QEMU binfmt setup may have failed."
echo "Run: docker run --privileged --rm tonistiigi/binfmt --install all" echo "Run: docker run --privileged --rm tonistiigi/binfmt --install all"
fi fi
else else
docker buildx use "$BUILDER_NAME" docker buildx use "$BUILDER_NAME"
fi fi
# Build command # Build command
BUILD_CMD="docker buildx build --platform ${PLATFORMS} --tag ${FULL_IMAGE}" BUILD_CMD="docker buildx build --platform ${PLATFORMS} --tag ${FULL_IMAGE}"
if [ "$PUSH" = true ]; then if [ "$PUSH" = true ]; then
BUILD_CMD="${BUILD_CMD} --push" BUILD_CMD="${BUILD_CMD} --push"
echo "Will push to: ${FULL_IMAGE}" echo "Will push to: ${FULL_IMAGE}"
elif [ "$LOAD" = true ]; then elif [ "$LOAD" = true ]; then
# --load only works with single platform # --load only works with single platform
if echo "$PLATFORMS" | grep -q ","; then if echo "$PLATFORMS" | grep -q ","; then
echo "ERROR: --load only works with a single platform." echo "ERROR: --load only works with a single platform."
echo "Use --arm64-only or --amd64-only with --load." echo "Use --arm64-only or --amd64-only with --load."
exit 1 exit 1
fi fi
BUILD_CMD="${BUILD_CMD} --load" BUILD_CMD="${BUILD_CMD} --load"
echo "Will load into local Docker" echo "Will load into local Docker"
fi fi
echo "" echo ""
echo "Building..." echo "Building..."
echo "Command: ${BUILD_CMD} ." echo "Command: ${BUILD_CMD} ."
echo "" echo ""
$BUILD_CMD . $BUILD_CMD .
echo "" echo ""
echo "============================================" echo "============================================"
echo " Build complete!" echo " Build complete!"
if [ "$PUSH" = true ]; then if [ "$PUSH" = true ]; then
echo " Image pushed to: ${FULL_IMAGE}" echo " Image pushed to: ${FULL_IMAGE}"
echo "" echo ""
echo " Pull on RPi5:" echo " Pull on RPi5:"
echo " docker pull ${FULL_IMAGE}" echo " docker pull ${FULL_IMAGE}"
fi fi
echo "============================================" echo "============================================"
download-weather-sat-samples.sh
+30 -30
View File
@@ -1,30 +1,30 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Download sample NOAA APT recordings for testing the weather satellite # Download sample NOAA APT recordings for testing the weather satellite
# test-decode feature. These are FM-demodulated audio WAV files. # test-decode feature. These are FM-demodulated audio WAV files.
# #
# Usage: # Usage:
# ./download-weather-sat-samples.sh # ./download-weather-sat-samples.sh
# docker exec intercept /app/download-weather-sat-samples.sh # docker exec intercept /app/download-weather-sat-samples.sh
set -euo pipefail set -euo pipefail
SAMPLE_DIR="$(dirname "$0")/data/weather_sat/samples" SAMPLE_DIR="$(dirname "$0")/data/weather_sat/samples"
mkdir -p "$SAMPLE_DIR" mkdir -p "$SAMPLE_DIR"
echo "Downloading NOAA APT sample files to $SAMPLE_DIR ..." echo "Downloading NOAA APT sample files to $SAMPLE_DIR ..."
# Full satellite pass recorded over Argentina (NOAA, 11025 Hz mono WAV) # Full satellite pass recorded over Argentina (NOAA, 11025 Hz mono WAV)
# Source: https://github.com/martinber/noaa-apt # Source: https://github.com/martinber/noaa-apt
if [ ! -f "$SAMPLE_DIR/noaa_apt_argentina.wav" ]; then if [ ! -f "$SAMPLE_DIR/noaa_apt_argentina.wav" ]; then
echo " -> noaa_apt_argentina.wav (18 MB) ..." echo " -> noaa_apt_argentina.wav (18 MB) ..."
curl -fSL -o "$SAMPLE_DIR/noaa_apt_argentina.wav" \ curl -fSL -o "$SAMPLE_DIR/noaa_apt_argentina.wav" \
"https://noaa-apt.mbernardi.com.ar/examples/argentina.wav" "https://noaa-apt.mbernardi.com.ar/examples/argentina.wav"
else else
echo " -> noaa_apt_argentina.wav (already exists)" echo " -> noaa_apt_argentina.wav (already exists)"
fi fi
echo "" echo ""
echo "Done. Test decode with:" echo "Done. Test decode with:"
echo " Satellite: NOAA-18" echo " Satellite: NOAA-18"
echo " File path: data/weather_sat/samples/noaa_apt_argentina.wav" echo " File path: data/weather_sat/samples/noaa_apt_argentina.wav"
echo " Sample rate: 11025 Hz" echo " Sample rate: 11025 Hz"