Consolidate docker checks

This commit is contained in:
Ryan Hughes committed 2025-10-27 00:23:29 -04:00
1 parent c2d62eddd6
commit e400a65fe4
4 files changed
+32 -45

No files matched your search

+4 -16
View File
@@ -16,17 +16,8 @@ ARCH_DIR="$BUILD_ROOT/pkgs.omarchy.org/$ARCH"
update_database() {
print_info "Updating repository database in Docker container..."
# Check for Docker
if ! command -v docker &>/dev/null; then
print_error "Docker is not installed"
exit 1
fi
# Check if Docker daemon is running
if ! docker info &>/dev/null; then
print_error "Docker daemon is not running"
exit 1
fi
# Check Docker is available
check_docker
# Ensure output directory exists
if [[ ! -d "$ARCH_DIR" ]]; then
@@ -42,11 +33,8 @@ update_database() {
sudo chown -R $(id -u):$(id -g) "$ARCH_DIR" 2>/dev/null || chmod -R 777 "$ARCH_DIR"
fi
# Build Docker image if needed (reuse the same image as build)
if ! docker image inspect omarchy-aur-builder:latest &>/dev/null; then
print_info "Building Docker image..."
docker build -t omarchy-aur-builder:latest -f "$BUILD_DIR/Dockerfile" "$BUILD_DIR"
fi
# Build Docker image
build_docker_image "$BUILD_DIR"
# Run repo-add in Docker container
docker run --rm \