fix: Move abuild-keygen inside build-alpine.sh for same-shell key persistence
This commit is contained in:
17
build-alpine.sh
Executable file → Normal file
17
build-alpine.sh
Executable file → Normal file
@ -15,12 +15,29 @@ fi
|
|||||||
|
|
||||||
# Check if running on Alpine
|
# Check if running on Alpine
|
||||||
|
|
||||||
|
# Check if running on Alpine
|
||||||
# Check if running on Alpine
|
# Check if running on Alpine
|
||||||
if ! command -v abuild &> /dev/null; then
|
if ! command -v abuild &> /dev/null; then
|
||||||
echo "Installing Alpine build tools..."
|
echo "Installing Alpine build tools..."
|
||||||
apk add --no-cache alpine-sdk rust cargo openssl-dev openrc git
|
apk add --no-cache alpine-sdk rust cargo openssl-dev openrc git
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Generate abuild signing keys (must be done in same shell session as abuild commands)
|
||||||
|
if [ ! -f /etc/abuild.conf ] || ! grep -q PACKAGER_PRIVKEY /etc/abuild.conf 2>/dev/null; then
|
||||||
|
echo "Generating abuild signing keys..."
|
||||||
|
apk add --no-cache abuild
|
||||||
|
abuild-keygen -a -n 2>&1 | tee /tmp/keygen.log
|
||||||
|
# Find the actual key file (handles missing username prefix)
|
||||||
|
KEYFILE=$(ls /root/.abuild/*.rsa 2>/dev/null | head -1)
|
||||||
|
if [ -z "$KEYFILE" ]; then
|
||||||
|
KEYFILE=$(ls /root/.abuild/-*.rsa 2>/dev/null | head -1)
|
||||||
|
fi
|
||||||
|
echo "Found key: $KEYFILE"
|
||||||
|
# Write directly to abuild.conf
|
||||||
|
echo "PACKAGER_PRIVKEY=\"$KEYFILE\"" >> /etc/abuild.conf
|
||||||
|
cat /etc/abuild.conf
|
||||||
|
fi
|
||||||
|
|
||||||
# Setup build environment
|
# Setup build environment
|
||||||
echo "Setting up build environment..."
|
echo "Setting up build environment..."
|
||||||
export CBUILDROOT=$(pwd)/.abuild
|
export CBUILDROOT=$(pwd)/.abuild
|
||||||
|
|||||||
Reference in New Issue
Block a user