Probably should have committed a long time ago...
This commit is contained in:
Ryan Hughes committed
commit
e00a529ba9
10 files changed
+1319
No files matched your search
@@ -0,0 +1,27 @@
|
||||
FROM archlinux:latest
|
||||
|
||||
# Update system and install build tools
|
||||
RUN pacman -Syu --noconfirm && \
|
||||
pacman -S --noconfirm base-devel git sudo wget
|
||||
|
||||
# Create build user
|
||||
RUN useradd -m -G wheel builder && \
|
||||
echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
|
||||
|
||||
# Create output directory
|
||||
RUN mkdir -p /output && chown builder:builder /output
|
||||
|
||||
USER builder
|
||||
WORKDIR /home/builder
|
||||
|
||||
# Copy package list
|
||||
COPY --chown=builder:builder packages ./
|
||||
|
||||
# Copy build scripts
|
||||
COPY --chown=builder:builder build-packages.sh ./
|
||||
COPY --chown=builder:builder build-aur.sh ./
|
||||
|
||||
# Make scripts executable
|
||||
RUN chmod +x build-packages.sh build-aur.sh
|
||||
|
||||
CMD ["./build-packages.sh"]
|
||||
@@ -0,0 +1,126 @@
|
||||
#!/bin/bash
|
||||
# AUR package building functions
|
||||
|
||||
# Simple function to build an AUR package
|
||||
build_aur_package() {
|
||||
local pkg="$1"
|
||||
local opts="$2"
|
||||
|
||||
echo " -> Building $pkg..."
|
||||
cd /src
|
||||
|
||||
# Case 1: Directory exists with PKGBUILD - check for updates
|
||||
if [[ -d "$pkg" ]] && [[ -f "$pkg/PKGBUILD" ]]; then
|
||||
cd "$pkg"
|
||||
|
||||
# Store current commit before pull
|
||||
OLD_COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "none")
|
||||
|
||||
# Try to pull updates
|
||||
git pull --quiet
|
||||
|
||||
# Get new commit after pull
|
||||
NEW_COMMIT=$(git rev-parse HEAD 2>/dev/null || echo "none")
|
||||
|
||||
# Determine if we need to build
|
||||
if [[ "$FORCE_REBUILD" == "true" ]]; then
|
||||
echo " Forcing rebuild..."
|
||||
elif [[ "$OLD_COMMIT" != "$NEW_COMMIT" ]]; then
|
||||
echo " Updates found, rebuilding..."
|
||||
else
|
||||
echo " No updates found, skipping"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Case 2: Directory exists but no PKGBUILD - reclone
|
||||
elif [[ -d "$pkg" ]]; then
|
||||
echo " Incomplete clone detected, removing and recloning..."
|
||||
rm -rf "$pkg"
|
||||
git clone "https://aur.archlinux.org/${pkg}.git" || {
|
||||
echo " Failed to clone $pkg"
|
||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||
return 1
|
||||
}
|
||||
cd "$pkg"
|
||||
|
||||
# Case 3: Directory doesn't exist - clone
|
||||
else
|
||||
git clone "https://aur.archlinux.org/${pkg}.git" || {
|
||||
echo " Failed to clone $pkg"
|
||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||
return 1
|
||||
}
|
||||
cd "$pkg"
|
||||
fi
|
||||
|
||||
# Build package
|
||||
MAKEPKG_FLAGS="-sc --noconfirm"
|
||||
|
||||
# Check for skip-pgp in options or global SKIP_PGP
|
||||
if [[ "$SKIP_PGP" == "true" ]] || [[ "$opts" == *"skip-pgp"* ]]; then
|
||||
MAKEPKG_FLAGS="$MAKEPKG_FLAGS --skippgpcheck"
|
||||
echo " (skipping PGP verification)"
|
||||
fi
|
||||
|
||||
if gpg --list-secret-keys 2>/dev/null | grep -q "sec"; then
|
||||
makepkg $MAKEPKG_FLAGS --sign || {
|
||||
echo " Failed to build $pkg"
|
||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||
cd /src
|
||||
return 1
|
||||
}
|
||||
else
|
||||
makepkg $MAKEPKG_FLAGS || {
|
||||
echo " Failed to build $pkg"
|
||||
FAILED_PACKAGES="$FAILED_PACKAGES $pkg"
|
||||
cd /src
|
||||
return 1
|
||||
}
|
||||
fi
|
||||
|
||||
# Copy to output and add to temporary build repo
|
||||
for pkg_file in *.pkg.tar.*; do
|
||||
if [[ -f "$pkg_file" ]] && [[ "$pkg_file" != *.sig ]]; then
|
||||
cp "$pkg_file" /output/
|
||||
# Add to temporary repo database (pointing to /output files)
|
||||
repo-add /tmp/build-repo/omarchy-build.db.tar.gz "/output/$pkg_file"
|
||||
fi
|
||||
done
|
||||
|
||||
# Update pacman database to see new packages
|
||||
sudo pacman -Sy
|
||||
|
||||
echo " Successfully built $pkg"
|
||||
cd /src
|
||||
}
|
||||
|
||||
build_aur_packages() {
|
||||
# Work in the mounted src directory
|
||||
cd /src
|
||||
|
||||
FAILED_PACKAGES=""
|
||||
|
||||
if [[ -s /tmp/packages.aur ]]; then
|
||||
echo "==> Building AUR packages..."
|
||||
while IFS= read -r line || [ -n "$line" ]; do
|
||||
[[ "$line" =~ ^#.*$ ]] && continue
|
||||
[[ -z "$line" ]] && continue
|
||||
|
||||
# Parse package name and options
|
||||
package=$(echo "$line" | awk '{print $1}')
|
||||
options=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
|
||||
|
||||
# Build the package
|
||||
build_aur_package "$package" "$options"
|
||||
done < /tmp/packages.aur
|
||||
|
||||
# Report failures at the end
|
||||
if [[ -n "$FAILED_PACKAGES" ]]; then
|
||||
echo ""
|
||||
echo "==> Failed packages:"
|
||||
for pkg in $FAILED_PACKAGES; do
|
||||
echo " - $pkg"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
#!/bin/bash
|
||||
# Main build script that runs inside Docker container
|
||||
set -e
|
||||
|
||||
echo "==> Setting up local repository..."
|
||||
# Create a temporary repo directory for build dependencies
|
||||
mkdir -p /tmp/build-repo
|
||||
|
||||
# Add local repo to pacman.conf so AUR packages can find their dependencies
|
||||
sudo tee -a /etc/pacman.conf > /dev/null << EOF
|
||||
|
||||
[omarchy-build]
|
||||
SigLevel = Optional TrustAll
|
||||
Server = file:///tmp/build-repo
|
||||
EOF
|
||||
|
||||
# Create initial empty database
|
||||
repo-add /tmp/build-repo/omarchy-build.db.tar.gz 2>/dev/null || true
|
||||
|
||||
# Sync pacman to recognize the new repo
|
||||
sudo pacman -Sy
|
||||
|
||||
echo "==> Processing package list..."
|
||||
FAILED_PACKAGES=""
|
||||
PROCESSED_PACKAGES=""
|
||||
|
||||
# Separate packages into official and AUR
|
||||
> /tmp/packages.official
|
||||
> /tmp/packages.aur
|
||||
|
||||
if [[ -f /home/builder/packages ]]; then
|
||||
while IFS= read -r line || [ -n "$line" ]; do
|
||||
[[ "$line" =~ ^#.*$ ]] && continue
|
||||
[[ -z "$line" ]] && continue
|
||||
|
||||
# Parse package name and options
|
||||
package=$(echo "$line" | awk '{print $1}')
|
||||
options=$(echo "$line" | awk '{$1=""; print $0}' | xargs)
|
||||
|
||||
# Check if it's in official repos
|
||||
if pacman -Si "$package" &>/dev/null; then
|
||||
echo "$package" >> /tmp/packages.official
|
||||
else
|
||||
echo "$line" >> /tmp/packages.aur # Keep options for AUR packages
|
||||
fi
|
||||
done < /home/builder/packages
|
||||
fi
|
||||
|
||||
# Show package counts
|
||||
echo "==> Package breakdown:"
|
||||
echo " -> Official packages: $(wc -l < /tmp/packages.official 2>/dev/null || echo 0)"
|
||||
echo " -> AUR packages: $(wc -l < /tmp/packages.aur 2>/dev/null || echo 0)"
|
||||
|
||||
# Debug: Show AUR packages if any
|
||||
if [[ -s /tmp/packages.aur ]]; then
|
||||
echo "==> AUR packages to build:"
|
||||
cat /tmp/packages.aur | while read line; do
|
||||
echo " - $line"
|
||||
done
|
||||
fi
|
||||
|
||||
echo "==> Downloading official packages..."
|
||||
if [[ -s /tmp/packages.official ]]; then
|
||||
while IFS= read -r package || [ -n "$package" ]; do
|
||||
echo " -> Downloading $package..."
|
||||
|
||||
# Download package without installing (will use default cache which is now /output)
|
||||
sudo pacman -Sw --noconfirm "$package" || {
|
||||
# Fallback to direct download
|
||||
url=$(pacman -Sp "$package" 2>/dev/null)
|
||||
if [[ -n "$url" ]]; then
|
||||
wget -q -P /output "$url" || echo " -> Failed: $package"
|
||||
fi
|
||||
}
|
||||
done < /tmp/packages.official
|
||||
fi
|
||||
|
||||
# Source the AUR build functions
|
||||
source /home/builder/build-aur.sh
|
||||
|
||||
# Build AUR packages
|
||||
build_aur_packages
|
||||
|
||||
echo "==> Build complete!"
|
||||
Reference in new issue
Block a user