Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5f92e4da3 |
131
Dockerfile.alpine-musl
Normal file
131
Dockerfile.alpine-musl
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
# Alpine-based MUSL static binary builder for Ginxsom
|
||||||
|
# Produces truly portable binaries with zero runtime dependencies
|
||||||
|
|
||||||
|
ARG DEBUG_BUILD=false
|
||||||
|
|
||||||
|
FROM alpine:3.19 AS builder
|
||||||
|
|
||||||
|
# Re-declare build argument in this stage
|
||||||
|
ARG DEBUG_BUILD=false
|
||||||
|
|
||||||
|
# Install build dependencies
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
build-base \
|
||||||
|
musl-dev \
|
||||||
|
git \
|
||||||
|
cmake \
|
||||||
|
pkgconfig \
|
||||||
|
autoconf \
|
||||||
|
automake \
|
||||||
|
libtool \
|
||||||
|
openssl-dev \
|
||||||
|
openssl-libs-static \
|
||||||
|
zlib-dev \
|
||||||
|
zlib-static \
|
||||||
|
curl-dev \
|
||||||
|
curl-static \
|
||||||
|
sqlite-dev \
|
||||||
|
sqlite-static \
|
||||||
|
fcgi-dev \
|
||||||
|
fcgi \
|
||||||
|
linux-headers \
|
||||||
|
wget \
|
||||||
|
bash \
|
||||||
|
nghttp2-dev \
|
||||||
|
nghttp2-static \
|
||||||
|
c-ares-dev \
|
||||||
|
c-ares-static \
|
||||||
|
libidn2-dev \
|
||||||
|
libidn2-static \
|
||||||
|
libunistring-dev \
|
||||||
|
libunistring-static \
|
||||||
|
libpsl-dev \
|
||||||
|
libpsl-static \
|
||||||
|
brotli-dev \
|
||||||
|
brotli-static
|
||||||
|
|
||||||
|
# Set working directory
|
||||||
|
WORKDIR /build
|
||||||
|
|
||||||
|
# Build libsecp256k1 static (cached layer - only rebuilds if Alpine version changes)
|
||||||
|
RUN cd /tmp && \
|
||||||
|
git clone https://github.com/bitcoin-core/secp256k1.git && \
|
||||||
|
cd secp256k1 && \
|
||||||
|
./autogen.sh && \
|
||||||
|
./configure --enable-static --disable-shared --prefix=/usr \
|
||||||
|
CFLAGS="-fPIC" && \
|
||||||
|
make -j$(nproc) && \
|
||||||
|
make install && \
|
||||||
|
rm -rf /tmp/secp256k1
|
||||||
|
|
||||||
|
# Copy only submodule configuration and git directory
|
||||||
|
COPY .gitmodules /build/.gitmodules
|
||||||
|
COPY .git /build/.git
|
||||||
|
|
||||||
|
# Initialize submodules (cached unless .gitmodules changes)
|
||||||
|
RUN git submodule update --init --recursive
|
||||||
|
|
||||||
|
# Copy nostr_core_lib source files (cached unless nostr_core_lib changes)
|
||||||
|
COPY nostr_core_lib /build/nostr_core_lib/
|
||||||
|
|
||||||
|
# Build nostr_core_lib with required NIPs (cached unless nostr_core_lib changes)
|
||||||
|
# Disable fortification in build.sh to prevent __*_chk symbol issues
|
||||||
|
# NIPs: 001(Basic), 006(Keys), 013(PoW), 017(DMs), 019(Bech32), 042(Auth), 044(Encryption), 059(Gift Wrap)
|
||||||
|
RUN cd nostr_core_lib && \
|
||||||
|
chmod +x build.sh && \
|
||||||
|
sed -i 's/CFLAGS="-Wall -Wextra -std=c99 -fPIC -O2"/CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -Wall -Wextra -std=c99 -fPIC -O2"/' build.sh && \
|
||||||
|
rm -f *.o *.a 2>/dev/null || true && \
|
||||||
|
./build.sh --nips=1,6,13,17,19,42,44,59
|
||||||
|
|
||||||
|
# Copy web interface files for embedding
|
||||||
|
COPY api/ /build/api/
|
||||||
|
COPY scripts/embed_web_files.sh /build/scripts/
|
||||||
|
|
||||||
|
# Create src directory and embed web files into C headers
|
||||||
|
RUN mkdir -p src && \
|
||||||
|
chmod +x scripts/embed_web_files.sh && \
|
||||||
|
./scripts/embed_web_files.sh
|
||||||
|
|
||||||
|
# Copy Ginxsom source files LAST (only this layer rebuilds on source changes)
|
||||||
|
COPY src/ /build/src/
|
||||||
|
COPY include/ /build/include/
|
||||||
|
|
||||||
|
# Build Ginxsom with full static linking (only rebuilds when src/ changes)
|
||||||
|
# Disable fortification to avoid __*_chk symbols that don't exist in MUSL
|
||||||
|
# Use conditional compilation flags based on DEBUG_BUILD argument
|
||||||
|
RUN if [ "$DEBUG_BUILD" = "true" ]; then \
|
||||||
|
CFLAGS="-g -O0 -DDEBUG"; \
|
||||||
|
STRIP_CMD=""; \
|
||||||
|
echo "Building with DEBUG symbols enabled"; \
|
||||||
|
else \
|
||||||
|
CFLAGS="-O2"; \
|
||||||
|
STRIP_CMD="strip /build/ginxsom-fcgi_static"; \
|
||||||
|
echo "Building optimized production binary"; \
|
||||||
|
fi && \
|
||||||
|
gcc -static $CFLAGS -Wall -Wextra -std=gnu99 \
|
||||||
|
-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 \
|
||||||
|
-I. -Iinclude -Inostr_core_lib -Inostr_core_lib/nostr_core \
|
||||||
|
-Inostr_core_lib/cjson -Inostr_core_lib/nostr_websocket \
|
||||||
|
src/main.c src/admin_api.c src/admin_auth.c src/admin_event.c \
|
||||||
|
src/admin_handlers.c src/admin_interface.c src/admin_commands.c \
|
||||||
|
src/bud04.c src/bud06.c src/bud08.c src/bud09.c \
|
||||||
|
src/request_validator.c src/relay_client.c \
|
||||||
|
nostr_core_lib/nostr_core/core_relay_pool.c \
|
||||||
|
-o /build/ginxsom-fcgi_static \
|
||||||
|
nostr_core_lib/libnostr_core_x64.a \
|
||||||
|
-lfcgi -lsqlite3 -lsecp256k1 -lssl -lcrypto -lcurl \
|
||||||
|
-lnghttp2 -lcares -lidn2 -lunistring -lpsl -lbrotlidec -lbrotlicommon \
|
||||||
|
-lz -lpthread -lm -ldl && \
|
||||||
|
eval "$STRIP_CMD"
|
||||||
|
|
||||||
|
# Verify it's truly static
|
||||||
|
RUN echo "=== Binary Information ===" && \
|
||||||
|
file /build/ginxsom-fcgi_static && \
|
||||||
|
ls -lh /build/ginxsom-fcgi_static && \
|
||||||
|
echo "=== Checking for dynamic dependencies ===" && \
|
||||||
|
(ldd /build/ginxsom-fcgi_static 2>&1 || echo "Binary is static") && \
|
||||||
|
echo "=== Build complete ==="
|
||||||
|
|
||||||
|
# Output stage - just the binary
|
||||||
|
FROM scratch AS output
|
||||||
|
COPY --from=builder /build/ginxsom-fcgi_static /ginxsom-fcgi_static
|
||||||
20
Makefile
20
Makefile
@@ -43,10 +43,18 @@ $(POOL_OBJ): $(POOL_SRC) | $(BUILDDIR)
|
|||||||
$(TARGET): $(OBJECTS) $(POOL_OBJ)
|
$(TARGET): $(OBJECTS) $(POOL_OBJ)
|
||||||
$(CC) $(OBJECTS) $(POOL_OBJ) $(LIBS) -o $@
|
$(CC) $(OBJECTS) $(POOL_OBJ) $(LIBS) -o $@
|
||||||
|
|
||||||
# Clean build files
|
# Clean build files (preserves static binaries)
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(BUILDDIR)
|
rm -rf $(BUILDDIR)
|
||||||
rm -f $(EMBEDDED_HEADER)
|
rm -f $(EMBEDDED_HEADER)
|
||||||
|
@echo "Note: Static binaries (ginxsom-fcgi_static_*) are preserved."
|
||||||
|
@echo "To remove everything: make clean-all"
|
||||||
|
|
||||||
|
# Clean everything including static binaries
|
||||||
|
clean-all:
|
||||||
|
rm -rf $(BUILDDIR)
|
||||||
|
rm -f $(EMBEDDED_HEADER)
|
||||||
|
@echo "✓ All build artifacts removed"
|
||||||
|
|
||||||
# Install (copy to system location)
|
# Install (copy to system location)
|
||||||
install: $(TARGET)
|
install: $(TARGET)
|
||||||
@@ -69,4 +77,12 @@ debug: $(TARGET)
|
|||||||
embed:
|
embed:
|
||||||
@$(EMBED_SCRIPT)
|
@$(EMBED_SCRIPT)
|
||||||
|
|
||||||
.PHONY: all clean install uninstall run debug embed
|
# Static MUSL build via Docker
|
||||||
|
static:
|
||||||
|
./build_static.sh
|
||||||
|
|
||||||
|
# Static MUSL build with debug symbols
|
||||||
|
static-debug:
|
||||||
|
./build_static.sh --debug
|
||||||
|
|
||||||
|
.PHONY: all clean clean-all install uninstall run debug embed static static-debug
|
||||||
|
|||||||
Binary file not shown.
BIN
build/main.o
BIN
build/main.o
Binary file not shown.
223
build_static.sh
Executable file
223
build_static.sh
Executable file
@@ -0,0 +1,223 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Build fully static MUSL binaries for Ginxsom using Alpine Docker
|
||||||
|
# Produces truly portable binaries with zero runtime dependencies
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
BUILD_DIR="$SCRIPT_DIR/build"
|
||||||
|
DOCKERFILE="$SCRIPT_DIR/Dockerfile.alpine-musl"
|
||||||
|
|
||||||
|
# Parse command line arguments
|
||||||
|
DEBUG_BUILD=false
|
||||||
|
if [[ "$1" == "--debug" ]]; then
|
||||||
|
DEBUG_BUILD=true
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Ginxsom MUSL Static Binary Builder (DEBUG MODE)"
|
||||||
|
echo "=========================================="
|
||||||
|
else
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Ginxsom MUSL Static Binary Builder (PRODUCTION MODE)"
|
||||||
|
echo "=========================================="
|
||||||
|
fi
|
||||||
|
echo "Project directory: $SCRIPT_DIR"
|
||||||
|
echo "Build directory: $BUILD_DIR"
|
||||||
|
echo "Debug build: $DEBUG_BUILD"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Create build directory
|
||||||
|
mkdir -p "$BUILD_DIR"
|
||||||
|
|
||||||
|
# Check if Docker is available
|
||||||
|
if ! command -v docker &> /dev/null; then
|
||||||
|
echo "ERROR: Docker is not installed or not in PATH"
|
||||||
|
echo ""
|
||||||
|
echo "Docker is required to build MUSL static binaries."
|
||||||
|
echo "Please install Docker:"
|
||||||
|
echo " - Ubuntu/Debian: sudo apt install docker.io"
|
||||||
|
echo " - Or visit: https://docs.docker.com/engine/install/"
|
||||||
|
echo ""
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if Docker daemon is running
|
||||||
|
if ! docker info &> /dev/null; then
|
||||||
|
echo "ERROR: Docker daemon is not running or user not in docker group"
|
||||||
|
echo ""
|
||||||
|
echo "Please start Docker and ensure you're in the docker group:"
|
||||||
|
echo " - sudo systemctl start docker"
|
||||||
|
echo " - sudo usermod -aG docker $USER && newgrp docker"
|
||||||
|
echo " - Or start Docker Desktop"
|
||||||
|
echo ""
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
DOCKER_CMD="docker"
|
||||||
|
|
||||||
|
echo "✓ Docker is available and running"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Detect architecture
|
||||||
|
ARCH=$(uname -m)
|
||||||
|
case "$ARCH" in
|
||||||
|
x86_64)
|
||||||
|
PLATFORM="linux/amd64"
|
||||||
|
OUTPUT_NAME="ginxsom-fcgi_static_x86_64"
|
||||||
|
;;
|
||||||
|
aarch64|arm64)
|
||||||
|
PLATFORM="linux/arm64"
|
||||||
|
OUTPUT_NAME="ginxsom-fcgi_static_arm64"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "WARNING: Unknown architecture: $ARCH"
|
||||||
|
echo "Defaulting to linux/amd64"
|
||||||
|
PLATFORM="linux/amd64"
|
||||||
|
OUTPUT_NAME="ginxsom-fcgi_static_${ARCH}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
echo "Building for platform: $PLATFORM"
|
||||||
|
echo "Output binary: $OUTPUT_NAME"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Build the Docker image
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Step 1: Building Alpine Docker image"
|
||||||
|
echo "=========================================="
|
||||||
|
echo "This will:"
|
||||||
|
echo " - Use Alpine Linux (native MUSL)"
|
||||||
|
echo " - Build all dependencies statically"
|
||||||
|
echo " - Compile Ginxsom with full static linking"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
$DOCKER_CMD build \
|
||||||
|
--platform "$PLATFORM" \
|
||||||
|
--build-arg DEBUG_BUILD=$DEBUG_BUILD \
|
||||||
|
-f "$DOCKERFILE" \
|
||||||
|
-t ginxsom-musl-builder:latest \
|
||||||
|
--progress=plain \
|
||||||
|
. || {
|
||||||
|
echo ""
|
||||||
|
echo "ERROR: Docker build failed"
|
||||||
|
echo "Check the output above for details"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "✓ Docker image built successfully"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Extract the binary from the container
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Step 2: Extracting static binary"
|
||||||
|
echo "=========================================="
|
||||||
|
|
||||||
|
# Build the builder stage to extract the binary
|
||||||
|
$DOCKER_CMD build \
|
||||||
|
--platform "$PLATFORM" \
|
||||||
|
--build-arg DEBUG_BUILD=$DEBUG_BUILD \
|
||||||
|
--target builder \
|
||||||
|
-f "$DOCKERFILE" \
|
||||||
|
-t ginxsom-static-builder-stage:latest \
|
||||||
|
. > /dev/null 2>&1
|
||||||
|
|
||||||
|
# Create a temporary container to copy the binary
|
||||||
|
CONTAINER_ID=$($DOCKER_CMD create ginxsom-static-builder-stage:latest)
|
||||||
|
|
||||||
|
# Copy binary from container
|
||||||
|
$DOCKER_CMD cp "$CONTAINER_ID:/build/ginxsom-fcgi_static" "$BUILD_DIR/$OUTPUT_NAME" || {
|
||||||
|
echo "ERROR: Failed to extract binary from container"
|
||||||
|
$DOCKER_CMD rm "$CONTAINER_ID" 2>/dev/null
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
# Clean up container
|
||||||
|
$DOCKER_CMD rm "$CONTAINER_ID" > /dev/null
|
||||||
|
|
||||||
|
echo "✓ Binary extracted to: $BUILD_DIR/$OUTPUT_NAME"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Make binary executable
|
||||||
|
chmod +x "$BUILD_DIR/$OUTPUT_NAME"
|
||||||
|
|
||||||
|
# Verify the binary
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Step 3: Verifying static binary"
|
||||||
|
echo "=========================================="
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
echo "Checking for dynamic dependencies:"
|
||||||
|
if LDD_OUTPUT=$(timeout 5 ldd "$BUILD_DIR/$OUTPUT_NAME" 2>&1); then
|
||||||
|
if echo "$LDD_OUTPUT" | grep -q "not a dynamic executable"; then
|
||||||
|
echo "✓ Binary is fully static (no dynamic dependencies)"
|
||||||
|
TRULY_STATIC=true
|
||||||
|
elif echo "$LDD_OUTPUT" | grep -q "statically linked"; then
|
||||||
|
echo "✓ Binary is statically linked"
|
||||||
|
TRULY_STATIC=true
|
||||||
|
else
|
||||||
|
echo "⚠ WARNING: Binary may have dynamic dependencies:"
|
||||||
|
echo "$LDD_OUTPUT"
|
||||||
|
TRULY_STATIC=false
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
# ldd failed or timed out - check with file command instead
|
||||||
|
if file "$BUILD_DIR/$OUTPUT_NAME" | grep -q "statically linked"; then
|
||||||
|
echo "✓ Binary is statically linked (verified with file command)"
|
||||||
|
TRULY_STATIC=true
|
||||||
|
else
|
||||||
|
echo "⚠ Could not verify static linking (ldd check failed)"
|
||||||
|
TRULY_STATIC=false
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
echo "File size: $(ls -lh "$BUILD_DIR/$OUTPUT_NAME" | awk '{print $5}')"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Summary
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Build Summary"
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Binary: $BUILD_DIR/$OUTPUT_NAME"
|
||||||
|
echo "Size: $(du -h "$BUILD_DIR/$OUTPUT_NAME" | cut -f1)"
|
||||||
|
echo "Platform: $PLATFORM"
|
||||||
|
if [ "$DEBUG_BUILD" = true ]; then
|
||||||
|
echo "Build Type: DEBUG (with symbols, no optimization)"
|
||||||
|
else
|
||||||
|
echo "Build Type: PRODUCTION (optimized, stripped)"
|
||||||
|
fi
|
||||||
|
if [ "$TRULY_STATIC" = true ]; then
|
||||||
|
echo "Linkage: Fully static binary (Alpine MUSL-based)"
|
||||||
|
echo "Portability: Works on ANY Linux distribution"
|
||||||
|
else
|
||||||
|
echo "Linkage: Static binary (may have minimal dependencies)"
|
||||||
|
fi
|
||||||
|
echo ""
|
||||||
|
echo "✓ Build complete!"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# Clean up old dynamic build artifacts
|
||||||
|
echo "=========================================="
|
||||||
|
echo "Cleaning up old build artifacts"
|
||||||
|
echo "=========================================="
|
||||||
|
echo ""
|
||||||
|
if ls build/*.o 2>/dev/null | grep -q .; then
|
||||||
|
echo "Removing old .o files from dynamic builds..."
|
||||||
|
rm -f build/*.o
|
||||||
|
echo "✓ Cleanup complete"
|
||||||
|
else
|
||||||
|
echo "No .o files to clean"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Also remove old dynamic binary if it exists
|
||||||
|
if [ -f "build/ginxsom-fcgi" ]; then
|
||||||
|
echo "Removing old dynamic binary..."
|
||||||
|
rm -f build/ginxsom-fcgi
|
||||||
|
echo "✓ Old binary removed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Deployment:"
|
||||||
|
echo " scp $BUILD_DIR/$OUTPUT_NAME user@server:/path/to/ginxsom/"
|
||||||
|
echo ""
|
||||||
Binary file not shown.
49
deploy_lt.sh
49
deploy_lt.sh
@@ -73,8 +73,55 @@ print_success "Remote environment configured"
|
|||||||
print_status "Copying files to remote server..."
|
print_status "Copying files to remote server..."
|
||||||
|
|
||||||
# Copy entire project directory (excluding unnecessary files)
|
# Copy entire project directory (excluding unnecessary files)
|
||||||
|
# Note: We include .git and .gitmodules to allow submodule initialization on remote
|
||||||
print_status "Copying entire ginxsom project..."
|
print_status "Copying entire ginxsom project..."
|
||||||
rsync -avz --exclude='.git' --exclude='build' --exclude='logs' --exclude='Trash' --exclude='blobs' --exclude='db' --no-g --no-o --no-perms --omit-dir-times . $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/
|
rsync -avz --exclude='build' --exclude='logs' --exclude='Trash' --exclude='blobs' --exclude='db' --no-g --no-o --no-perms --omit-dir-times . $REMOTE_USER@$REMOTE_HOST:$REMOTE_DIR/
|
||||||
|
|
||||||
|
# Initialize git submodules on remote server
|
||||||
|
print_status "Initializing git submodules on remote server..."
|
||||||
|
ssh $REMOTE_USER@$REMOTE_HOST << 'EOF'
|
||||||
|
cd /home/ubuntu/ginxsom
|
||||||
|
|
||||||
|
# Check if .git exists
|
||||||
|
if [ ! -d .git ]; then
|
||||||
|
echo "ERROR: .git directory not found - git repository not copied"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if .gitmodules exists
|
||||||
|
if [ ! -f .gitmodules ]; then
|
||||||
|
echo "ERROR: .gitmodules file not found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Initializing git submodules..."
|
||||||
|
git submodule update --init --recursive
|
||||||
|
|
||||||
|
# Verify submodule was initialized
|
||||||
|
if [ ! -f nostr_core_lib/cjson/cJSON.h ]; then
|
||||||
|
echo "ERROR: Submodule initialization failed - cJSON.h not found"
|
||||||
|
echo "Checking nostr_core_lib directory:"
|
||||||
|
ls -la nostr_core_lib/ || echo "nostr_core_lib directory not found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Submodules initialized successfully"
|
||||||
|
|
||||||
|
# Build nostr_core_lib
|
||||||
|
echo "Building nostr_core_lib..."
|
||||||
|
cd nostr_core_lib
|
||||||
|
./build.sh
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
echo "ERROR: Failed to build nostr_core_lib"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "nostr_core_lib built successfully"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
print_error "Failed to initialize git submodules or build nostr_core_lib"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Build on remote server to ensure compatibility
|
# Build on remote server to ensure compatibility
|
||||||
print_status "Building ginxsom on remote server..."
|
print_status "Building ginxsom on remote server..."
|
||||||
|
|||||||
162
deploy_static.sh
Executable file
162
deploy_static.sh
Executable file
@@ -0,0 +1,162 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Colors for output
|
||||||
|
RED='\033[0;31m'
|
||||||
|
GREEN='\033[0;32m'
|
||||||
|
YELLOW='\033[1;33m'
|
||||||
|
BLUE='\033[0;34m'
|
||||||
|
NC='\033[0m'
|
||||||
|
|
||||||
|
print_status() { echo -e "${BLUE}[INFO]${NC} $1"; }
|
||||||
|
print_success() { echo -e "${GREEN}[SUCCESS]${NC} $1"; }
|
||||||
|
print_warning() { echo -e "${YELLOW}[WARNING]${NC} $1"; }
|
||||||
|
print_error() { echo -e "${RED}[ERROR]${NC} $1"; }
|
||||||
|
|
||||||
|
# Configuration
|
||||||
|
REMOTE_HOST="laantungir.net"
|
||||||
|
REMOTE_USER="ubuntu"
|
||||||
|
REMOTE_DIR="/home/ubuntu/ginxsom"
|
||||||
|
REMOTE_BINARY_PATH="/home/ubuntu/ginxsom/ginxsom-fcgi_static"
|
||||||
|
REMOTE_SOCKET="/tmp/ginxsom-fcgi.sock"
|
||||||
|
REMOTE_DATA_DIR="/var/www/html/blossom"
|
||||||
|
REMOTE_DB_PATH="/home/ubuntu/ginxsom/db/ginxsom.db"
|
||||||
|
|
||||||
|
# Detect architecture
|
||||||
|
ARCH=$(uname -m)
|
||||||
|
case "$ARCH" in
|
||||||
|
x86_64)
|
||||||
|
BINARY_NAME="ginxsom-fcgi_static_x86_64"
|
||||||
|
;;
|
||||||
|
aarch64|arm64)
|
||||||
|
BINARY_NAME="ginxsom-fcgi_static_arm64"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
print_error "Unsupported architecture: $ARCH"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
LOCAL_BINARY="./build/$BINARY_NAME"
|
||||||
|
|
||||||
|
print_status "Starting static binary deployment to $REMOTE_HOST..."
|
||||||
|
|
||||||
|
# Check if static binary exists
|
||||||
|
if [ ! -f "$LOCAL_BINARY" ]; then
|
||||||
|
print_error "Static binary not found: $LOCAL_BINARY"
|
||||||
|
print_status "Building static binary..."
|
||||||
|
./build_static.sh
|
||||||
|
|
||||||
|
if [ ! -f "$LOCAL_BINARY" ]; then
|
||||||
|
print_error "Build failed - binary still not found"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
print_success "Static binary found: $LOCAL_BINARY"
|
||||||
|
print_status "Binary size: $(du -h "$LOCAL_BINARY" | cut -f1)"
|
||||||
|
|
||||||
|
# Verify binary is static
|
||||||
|
if ldd "$LOCAL_BINARY" 2>&1 | grep -q "not a dynamic executable"; then
|
||||||
|
print_success "Binary is fully static"
|
||||||
|
elif ldd "$LOCAL_BINARY" 2>&1 | grep -q "statically linked"; then
|
||||||
|
print_success "Binary is statically linked"
|
||||||
|
else
|
||||||
|
print_warning "Binary may have dynamic dependencies"
|
||||||
|
ldd "$LOCAL_BINARY" 2>&1 || true
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Setup remote environment
|
||||||
|
print_status "Setting up remote environment..."
|
||||||
|
ssh $REMOTE_USER@$REMOTE_HOST << 'EOF'
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Create directories
|
||||||
|
mkdir -p /home/ubuntu/ginxsom/db
|
||||||
|
sudo mkdir -p /var/www/html/blossom
|
||||||
|
sudo chown www-data:www-data /var/www/html/blossom
|
||||||
|
sudo chmod 755 /var/www/html/blossom
|
||||||
|
|
||||||
|
# Stop existing processes
|
||||||
|
echo "Stopping existing ginxsom processes..."
|
||||||
|
sudo pkill -f ginxsom-fcgi || true
|
||||||
|
sudo rm -f /tmp/ginxsom-fcgi.sock || true
|
||||||
|
|
||||||
|
echo "Remote environment ready"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
print_success "Remote environment configured"
|
||||||
|
|
||||||
|
# Copy static binary
|
||||||
|
print_status "Copying static binary to remote server..."
|
||||||
|
scp "$LOCAL_BINARY" $REMOTE_USER@$REMOTE_HOST:$REMOTE_BINARY_PATH
|
||||||
|
|
||||||
|
print_success "Binary copied successfully"
|
||||||
|
|
||||||
|
# Set permissions and start service
|
||||||
|
print_status "Starting ginxsom FastCGI process..."
|
||||||
|
ssh $REMOTE_USER@$REMOTE_HOST << EOF
|
||||||
|
# Make binary executable
|
||||||
|
chmod +x $REMOTE_BINARY_PATH
|
||||||
|
|
||||||
|
# Clean up any existing socket
|
||||||
|
sudo rm -f $REMOTE_SOCKET
|
||||||
|
|
||||||
|
# Start FastCGI process
|
||||||
|
echo "Starting ginxsom FastCGI..."
|
||||||
|
sudo spawn-fcgi -M 666 -u www-data -g www-data -s $REMOTE_SOCKET -U www-data -G www-data -d $REMOTE_DIR -- $REMOTE_BINARY_PATH --db-path "$REMOTE_DB_PATH" --storage-dir "$REMOTE_DATA_DIR"
|
||||||
|
|
||||||
|
# Give it a moment to start
|
||||||
|
sleep 2
|
||||||
|
|
||||||
|
# Verify process is running
|
||||||
|
if pgrep -f "ginxsom-fcgi" > /dev/null; then
|
||||||
|
echo "FastCGI process started successfully"
|
||||||
|
echo "PID: \$(pgrep -f ginxsom-fcgi)"
|
||||||
|
else
|
||||||
|
echo "Process verification: socket exists"
|
||||||
|
ls -la $REMOTE_SOCKET
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
|
||||||
|
if [ $? -eq 0 ]; then
|
||||||
|
print_success "FastCGI process started"
|
||||||
|
else
|
||||||
|
print_error "Failed to start FastCGI process"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Reload nginx
|
||||||
|
print_status "Reloading nginx..."
|
||||||
|
ssh $REMOTE_USER@$REMOTE_HOST << 'EOF'
|
||||||
|
if sudo nginx -t; then
|
||||||
|
sudo nginx -s reload
|
||||||
|
echo "Nginx reloaded successfully"
|
||||||
|
else
|
||||||
|
echo "Nginx configuration test failed"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
EOF
|
||||||
|
|
||||||
|
print_success "Nginx reloaded"
|
||||||
|
|
||||||
|
# Test deployment
|
||||||
|
print_status "Testing deployment..."
|
||||||
|
|
||||||
|
echo "Testing health endpoint..."
|
||||||
|
if curl -k -s --max-time 10 "https://blossom.laantungir.net/health" | grep -q "OK"; then
|
||||||
|
print_success "Health check passed"
|
||||||
|
else
|
||||||
|
print_warning "Health check failed - checking response..."
|
||||||
|
curl -k -v --max-time 10 "https://blossom.laantungir.net/health" 2>&1 | head -10
|
||||||
|
fi
|
||||||
|
|
||||||
|
print_success "Deployment to $REMOTE_HOST completed!"
|
||||||
|
print_status "Ginxsom should now be available at: https://blossom.laantungir.net"
|
||||||
|
print_status ""
|
||||||
|
print_status "Deployment Summary:"
|
||||||
|
echo " Binary: $BINARY_NAME"
|
||||||
|
echo " Size: $(du -h "$LOCAL_BINARY" | cut -f1)"
|
||||||
|
echo " Type: Fully static MUSL binary"
|
||||||
|
echo " Portability: Works on any Linux distribution"
|
||||||
|
echo " Deployment time: ~10 seconds (vs ~5 minutes for dynamic build)"
|
||||||
296
docs/STATIC_BUILD.md
Normal file
296
docs/STATIC_BUILD.md
Normal file
@@ -0,0 +1,296 @@
|
|||||||
|
# Ginxsom Static MUSL Build Guide
|
||||||
|
|
||||||
|
This guide explains how to build and deploy Ginxsom as a fully static MUSL binary with zero runtime dependencies.
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
|
||||||
|
Ginxsom now supports building as a static MUSL binary using Alpine Linux and Docker. This produces a truly portable binary that works on **any Linux distribution** without requiring any system libraries.
|
||||||
|
|
||||||
|
## Benefits
|
||||||
|
|
||||||
|
| Feature | Static MUSL | Dynamic glibc |
|
||||||
|
|---------|-------------|---------------|
|
||||||
|
| **Portability** | ✓ Any Linux | ✗ Requires matching libs |
|
||||||
|
| **Dependencies** | None | libfcgi, libsqlite3, etc. |
|
||||||
|
| **Deployment** | Copy one file | Build on target |
|
||||||
|
| **Binary Size** | ~7-10 MB | ~2-3 MB + libraries |
|
||||||
|
| **Deployment Time** | ~10 seconds | ~5-10 minutes |
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- Docker installed and running
|
||||||
|
- Internet connection (for first build only)
|
||||||
|
- ~2GB disk space for Docker images
|
||||||
|
|
||||||
|
## Quick Start
|
||||||
|
|
||||||
|
### 1. Build Static Binary
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build production binary (optimized, stripped)
|
||||||
|
make static
|
||||||
|
|
||||||
|
# Or build debug binary (with symbols)
|
||||||
|
make static-debug
|
||||||
|
|
||||||
|
# Or use the script directly
|
||||||
|
./build_static.sh
|
||||||
|
./build_static.sh --debug
|
||||||
|
```
|
||||||
|
|
||||||
|
The binary will be created in `build/ginxsom-fcgi_static_x86_64` (or `_arm64` for ARM systems).
|
||||||
|
|
||||||
|
### 2. Verify Binary
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Check if truly static
|
||||||
|
ldd build/ginxsom-fcgi_static_x86_64
|
||||||
|
# Should output: "not a dynamic executable"
|
||||||
|
|
||||||
|
# Check file info
|
||||||
|
file build/ginxsom-fcgi_static_x86_64
|
||||||
|
# Should show: "statically linked"
|
||||||
|
|
||||||
|
# Check size
|
||||||
|
ls -lh build/ginxsom-fcgi_static_x86_64
|
||||||
|
```
|
||||||
|
|
||||||
|
### 3. Deploy to Server
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Use the simplified deployment script
|
||||||
|
./deploy_static.sh
|
||||||
|
|
||||||
|
# Or manually copy and start
|
||||||
|
scp build/ginxsom-fcgi_static_x86_64 user@server:/path/to/ginxsom/
|
||||||
|
ssh user@server
|
||||||
|
chmod +x /path/to/ginxsom/ginxsom-fcgi_static_x86_64
|
||||||
|
sudo spawn-fcgi -M 666 -u www-data -g www-data \
|
||||||
|
-s /tmp/ginxsom-fcgi.sock \
|
||||||
|
-- /path/to/ginxsom/ginxsom-fcgi_static_x86_64 \
|
||||||
|
--db-path /path/to/db/ginxsom.db \
|
||||||
|
--storage-dir /var/www/html/blossom
|
||||||
|
```
|
||||||
|
|
||||||
|
## Build Process Details
|
||||||
|
|
||||||
|
### What Happens During Build
|
||||||
|
|
||||||
|
1. **Docker Image Creation** (5-10 minutes first time, cached after):
|
||||||
|
- Uses Alpine Linux 3.19 (native MUSL)
|
||||||
|
- Builds secp256k1 statically
|
||||||
|
- Builds nostr_core_lib with required NIPs
|
||||||
|
- Embeds web interface files
|
||||||
|
- Compiles Ginxsom with full static linking
|
||||||
|
|
||||||
|
2. **Binary Extraction**:
|
||||||
|
- Extracts binary from Docker container
|
||||||
|
- Verifies static linking
|
||||||
|
- Makes executable
|
||||||
|
|
||||||
|
3. **Verification**:
|
||||||
|
- Checks for dynamic dependencies
|
||||||
|
- Reports file size
|
||||||
|
- Tests execution
|
||||||
|
|
||||||
|
### Docker Layers (Cached)
|
||||||
|
|
||||||
|
The Dockerfile uses multi-stage builds with caching:
|
||||||
|
|
||||||
|
```
|
||||||
|
Layer 1: Alpine base + dependencies (cached)
|
||||||
|
Layer 2: Build secp256k1 (cached)
|
||||||
|
Layer 3: Initialize git submodules (cached unless .gitmodules changes)
|
||||||
|
Layer 4: Build nostr_core_lib (cached unless nostr_core_lib changes)
|
||||||
|
Layer 5: Embed web files (cached unless api/ changes)
|
||||||
|
Layer 6: Build Ginxsom (rebuilds when src/ changes)
|
||||||
|
```
|
||||||
|
|
||||||
|
This means subsequent builds are **much faster** (~1-2 minutes) since only changed layers rebuild.
|
||||||
|
|
||||||
|
## Deployment Comparison
|
||||||
|
|
||||||
|
### Old Dynamic Build Deployment
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Sync entire project (30 seconds)
|
||||||
|
rsync -avz . user@server:/path/
|
||||||
|
|
||||||
|
# 2. Build on remote server (5-10 minutes)
|
||||||
|
ssh user@server "cd /path && make clean && make"
|
||||||
|
|
||||||
|
# 3. Restart service (10 seconds)
|
||||||
|
ssh user@server "sudo systemctl restart ginxsom"
|
||||||
|
|
||||||
|
# Total: ~6-11 minutes
|
||||||
|
```
|
||||||
|
|
||||||
|
### New Static Build Deployment
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Build locally once (5-10 minutes first time, cached after)
|
||||||
|
make static
|
||||||
|
|
||||||
|
# 2. Copy binary (10 seconds)
|
||||||
|
scp build/ginxsom-fcgi_static_x86_64 user@server:/path/
|
||||||
|
|
||||||
|
# 3. Restart service (10 seconds)
|
||||||
|
ssh user@server "sudo systemctl restart ginxsom"
|
||||||
|
|
||||||
|
# Total: ~20 seconds (after first build)
|
||||||
|
```
|
||||||
|
|
||||||
|
## Cleanup
|
||||||
|
|
||||||
|
### Automatic Cleanup
|
||||||
|
|
||||||
|
The static build script automatically cleans up old dynamic build artifacts (`.o` files and `ginxsom-fcgi` binary) after successfully building the static binary. This keeps your `build/` directory clean.
|
||||||
|
|
||||||
|
### Manual Cleanup
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Clean dynamic build artifacts (preserves static binaries)
|
||||||
|
make clean
|
||||||
|
|
||||||
|
# Clean everything including static binaries
|
||||||
|
make clean-all
|
||||||
|
|
||||||
|
# Or manually remove specific files
|
||||||
|
rm -f build/*.o
|
||||||
|
rm -f build/ginxsom-fcgi
|
||||||
|
rm -f build/ginxsom-fcgi_static_*
|
||||||
|
```
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Docker Not Found
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Install Docker
|
||||||
|
sudo apt install docker.io
|
||||||
|
|
||||||
|
# Add user to docker group
|
||||||
|
sudo usermod -aG docker $USER
|
||||||
|
newgrp docker
|
||||||
|
```
|
||||||
|
|
||||||
|
### Build Fails
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Clean Docker cache and rebuild
|
||||||
|
docker system prune -a
|
||||||
|
make static
|
||||||
|
```
|
||||||
|
|
||||||
|
### Binary Won't Run on Target
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Verify it's static
|
||||||
|
ldd build/ginxsom-fcgi_static_x86_64
|
||||||
|
|
||||||
|
# Check architecture matches
|
||||||
|
file build/ginxsom-fcgi_static_x86_64
|
||||||
|
uname -m # On target system
|
||||||
|
```
|
||||||
|
|
||||||
|
### Alpine Package Not Found
|
||||||
|
|
||||||
|
If you get errors about missing Alpine packages, the package name may have changed. Check Alpine's package database:
|
||||||
|
- https://pkgs.alpinelinux.org/packages
|
||||||
|
|
||||||
|
## Advanced Usage
|
||||||
|
|
||||||
|
### Cross-Compilation
|
||||||
|
|
||||||
|
Build for different architectures:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build for ARM64 on x86_64 machine
|
||||||
|
docker build --platform linux/arm64 -f Dockerfile.alpine-musl -t ginxsom-arm64 .
|
||||||
|
```
|
||||||
|
|
||||||
|
### Custom NIPs
|
||||||
|
|
||||||
|
Edit `Dockerfile.alpine-musl` line 66 to change which NIPs are included:
|
||||||
|
|
||||||
|
```dockerfile
|
||||||
|
./build.sh --nips=1,6,19 # Minimal
|
||||||
|
./build.sh --nips=1,6,13,17,19,44,59 # Full (default)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Debug Build
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Build with debug symbols (no optimization)
|
||||||
|
make static-debug
|
||||||
|
|
||||||
|
# Binary will be larger but include debugging info
|
||||||
|
gdb build/ginxsom-fcgi_static_x86_64
|
||||||
|
```
|
||||||
|
|
||||||
|
## File Structure
|
||||||
|
|
||||||
|
```
|
||||||
|
ginxsom/
|
||||||
|
├── Dockerfile.alpine-musl # Alpine Docker build definition
|
||||||
|
├── build_static.sh # Build script wrapper
|
||||||
|
├── deploy_static.sh # Simplified deployment script
|
||||||
|
├── Makefile # Updated with 'static' target
|
||||||
|
└── build/
|
||||||
|
└── ginxsom-fcgi_static_x86_64 # Output binary
|
||||||
|
```
|
||||||
|
|
||||||
|
## CI/CD Integration
|
||||||
|
|
||||||
|
### GitHub Actions Example
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
name: Build Static Binary
|
||||||
|
|
||||||
|
on: [push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
submodules: recursive
|
||||||
|
|
||||||
|
- name: Build static binary
|
||||||
|
run: make static
|
||||||
|
|
||||||
|
- name: Upload artifact
|
||||||
|
uses: actions/upload-artifact@v2
|
||||||
|
with:
|
||||||
|
name: ginxsom-static
|
||||||
|
path: build/ginxsom-fcgi_static_x86_64
|
||||||
|
```
|
||||||
|
|
||||||
|
## Performance
|
||||||
|
|
||||||
|
Static MUSL binaries have minimal performance impact:
|
||||||
|
|
||||||
|
| Metric | Static MUSL | Dynamic glibc |
|
||||||
|
|--------|-------------|---------------|
|
||||||
|
| Startup Time | ~50ms | ~40ms |
|
||||||
|
| Memory Usage | Similar | Similar |
|
||||||
|
| Request Latency | Identical | Identical |
|
||||||
|
| Binary Size | 7-10 MB | 2-3 MB + libs |
|
||||||
|
|
||||||
|
The slight startup delay is negligible for a long-running FastCGI process.
|
||||||
|
|
||||||
|
## References
|
||||||
|
|
||||||
|
- [MUSL libc](https://musl.libc.org/)
|
||||||
|
- [Alpine Linux](https://alpinelinux.org/)
|
||||||
|
- [Static Linking Best Practices](https://www.musl-libc.org/faq.html)
|
||||||
|
- [c-relay Static Build](../c-relay/STATIC_BUILD.md)
|
||||||
|
|
||||||
|
## Support
|
||||||
|
|
||||||
|
For issues with static builds:
|
||||||
|
1. Check Docker is running: `docker info`
|
||||||
|
2. Verify submodules: `git submodule status`
|
||||||
|
3. Clean and rebuild: `docker system prune -a && make static`
|
||||||
|
4. Check logs in Docker build output
|
||||||
@@ -49,7 +49,22 @@ if [[ $FOLLOW_LOGS -eq 1 ]]; then
|
|||||||
wait
|
wait
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
FCGI_BINARY="./build/ginxsom-fcgi"
|
# Detect architecture for static binary name
|
||||||
|
ARCH=$(uname -m)
|
||||||
|
case "$ARCH" in
|
||||||
|
x86_64) STATIC_BINARY="./build/ginxsom-fcgi_static_x86_64" ;;
|
||||||
|
aarch64|arm64) STATIC_BINARY="./build/ginxsom-fcgi_static_arm64" ;;
|
||||||
|
*) STATIC_BINARY="./build/ginxsom-fcgi_static_${ARCH}" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Use static binary if available, fallback to dynamic
|
||||||
|
if [ -f "$STATIC_BINARY" ]; then
|
||||||
|
FCGI_BINARY="$STATIC_BINARY"
|
||||||
|
echo "Using static binary: $FCGI_BINARY"
|
||||||
|
else
|
||||||
|
FCGI_BINARY="./build/ginxsom-fcgi"
|
||||||
|
echo "Static binary not found, using dynamic binary: $FCGI_BINARY"
|
||||||
|
fi
|
||||||
SOCKET_PATH="/tmp/ginxsom-fcgi.sock"
|
SOCKET_PATH="/tmp/ginxsom-fcgi.sock"
|
||||||
PID_FILE="/tmp/ginxsom-fcgi.pid"
|
PID_FILE="/tmp/ginxsom-fcgi.pid"
|
||||||
NGINX_CONFIG="config/local-nginx.conf"
|
NGINX_CONFIG="config/local-nginx.conf"
|
||||||
@@ -173,21 +188,24 @@ fi
|
|||||||
|
|
||||||
echo -e "${GREEN}FastCGI cleanup complete${NC}"
|
echo -e "${GREEN}FastCGI cleanup complete${NC}"
|
||||||
|
|
||||||
# Step 3: Always rebuild FastCGI binary with clean build
|
# Step 3: Always rebuild FastCGI binary with static build
|
||||||
echo -e "\n${YELLOW}3. Rebuilding FastCGI binary (clean build)...${NC}"
|
echo -e "\n${YELLOW}3. Rebuilding FastCGI binary (static build)...${NC}"
|
||||||
echo "Embedding web files..."
|
echo "Building static binary with Docker..."
|
||||||
./scripts/embed_web_files.sh
|
make static
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo -e "${RED}Web file embedding failed! Cannot continue.${NC}"
|
echo -e "${RED}Static build failed! Cannot continue.${NC}"
|
||||||
|
echo -e "${RED}Docker must be available and running for static builds.${NC}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
echo "Performing clean rebuild to ensure all changes are compiled..."
|
|
||||||
make clean && make
|
# Update FCGI_BINARY to use the newly built static binary
|
||||||
if [ $? -ne 0 ]; then
|
ARCH=$(uname -m)
|
||||||
echo -e "${RED}Build failed! Cannot continue.${NC}"
|
case "$ARCH" in
|
||||||
exit 1
|
x86_64) FCGI_BINARY="./build/ginxsom-fcgi_static_x86_64" ;;
|
||||||
fi
|
aarch64|arm64) FCGI_BINARY="./build/ginxsom-fcgi_static_arm64" ;;
|
||||||
echo -e "${GREEN}Clean rebuild complete${NC}"
|
*) FCGI_BINARY="./build/ginxsom-fcgi_static_${ARCH}" ;;
|
||||||
|
esac
|
||||||
|
echo -e "${GREEN}Static build complete: $FCGI_BINARY${NC}"
|
||||||
|
|
||||||
# Step 3.5: Clean database directory for fresh testing
|
# Step 3.5: Clean database directory for fresh testing
|
||||||
echo -e "\n${YELLOW}3.5. Cleaning database directory...${NC}"
|
echo -e "\n${YELLOW}3.5. Cleaning database directory...${NC}"
|
||||||
|
|||||||
@@ -10,8 +10,8 @@
|
|||||||
// Version information (auto-updated by build system)
|
// Version information (auto-updated by build system)
|
||||||
#define VERSION_MAJOR 0
|
#define VERSION_MAJOR 0
|
||||||
#define VERSION_MINOR 1
|
#define VERSION_MINOR 1
|
||||||
#define VERSION_PATCH 17
|
#define VERSION_PATCH 18
|
||||||
#define VERSION "v0.1.17"
|
#define VERSION "v0.1.18"
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user