12 Commits

Author SHA1 Message Date
b926b303c5 v0.2.4
All checks were successful
Docker Image CI / Build build images (arch) (push) Successful in 6s
Docker Image CI / Build build images (artix) (push) Successful in -42s
NPM Audit Check / Check NPM audit (push) Successful in -2m9s
App Image CI / Build app image (push) Successful in -1m6s
2025-11-12 01:39:21 -05:00
d14ccdf939 define custom mirror at runtime
All checks were successful
App Image CI / Build app image (push) Successful in -1m15s
Docker Image CI / Build build images (arch) (push) Successful in 1s
Docker Image CI / Build build images (artix) (push) Successful in -34s
NPM Audit Check / Check NPM audit (push) Successful in -2m9s
2025-11-12 01:30:57 -05:00
259f439101 add tier option 2025-11-12 01:12:18 -05:00
1f454fa656 archive pls
All checks were successful
App Image CI / Build app image (push) Successful in -1m23s
Docker Image CI / Build build images (arch) (push) Successful in 1s
Docker Image CI / Build build images (artix) (push) Successful in -27s
NPM Audit Check / Check NPM audit (push) Successful in -2m10s
2025-10-28 19:13:07 -05:00
18c0e27da4 this is ridiculous now
All checks were successful
Docker Image CI / Build build images (artix) (push) Successful in -28s
NPM Audit Check / Check NPM audit (push) Successful in -2m11s
App Image CI / Build app image (push) Successful in -1m25s
Docker Image CI / Build build images (arch) (push) Successful in 3s
2025-10-28 17:49:29 -05:00
d34b41b899 debugging gitea's poor handling of actions
Some checks failed
App Image CI / Build app image (push) Has been cancelled
Docker Image CI / Build build images (arch) (push) Has been cancelled
NPM Audit Check / Check NPM audit (push) Successful in -2m11s
Docker Image CI / Build build images (artix) (push) Successful in -26s
2025-10-28 17:35:56 -05:00
9fe86c4114 support for a post-entrypoint script
All checks were successful
App Image CI / Build app image (push) Successful in -1m24s
Docker Image CI / Build build images (arch) (push) Successful in -1s
Docker Image CI / Build build images (artix) (push) Successful in -25s
NPM Audit Check / Check NPM audit (push) Successful in -2m10s
2025-10-28 17:17:34 -05:00
3b5ff4cf41 last debug info
All checks were successful
App Image CI / Build app image (push) Successful in -1m24s
Docker Image CI / Build build images (arch) (push) Successful in 1s
Docker Image CI / Build build images (artix) (push) Successful in -28s
NPM Audit Check / Check NPM audit (push) Successful in -2m10s
2025-10-28 13:07:59 -05:00
7b51f818d7 create archery file for debugging gitea actions
All checks were successful
App Image CI / Build app image (push) Successful in -1m22s
Docker Image CI / Build build images (arch) (push) Successful in 20s
Docker Image CI / Build build images (artix) (push) Successful in -29s
NPM Audit Check / Check NPM audit (push) Successful in -2m11s
2025-10-28 12:57:20 -05:00
5a16695338 make directory configurable
All checks were successful
App Image CI / Build app image (push) Successful in -1m26s
Docker Image CI / Build build images (arch) (push) Successful in -5s
Docker Image CI / Build build images (artix) (push) Successful in -34s
NPM Audit Check / Check NPM audit (push) Successful in -2m11s
2025-10-27 23:54:01 -05:00
a5c77c1440 bump validator.js version
All checks were successful
NPM Audit Check / Check NPM audit (push) Successful in -2m11s
App Image CI / Build app image (push) Successful in -1m8s
2025-10-27 23:08:42 -05:00
a6d35036f3 skip clone if repo mounted
Some checks failed
App Image CI / Build app image (push) Successful in -1m25s
Docker Image CI / Build build images (arch) (push) Successful in -10s
Docker Image CI / Build build images (artix) (push) Successful in -37s
NPM Audit Check / Check NPM audit (push) Failing after -2m10s
2025-10-25 02:05:37 -05:00
11 changed files with 211 additions and 136 deletions

View File

@@ -1,12 +1,16 @@
FROM archlinux/archlinux:base-devel
COPY scripts/entrypoint.sh /scripts/entrypoint.sh
COPY scripts/pacman.conf.arch/* /scripts/pacman.conf/
COPY scripts/pacman.conf.arch/pacman.conf.pl /scripts/pacman.conf.pl
ARG MIRROR=https://mirror.sanin.dev/arch-linux/\$repo/os/\$arch
ARG BUILDMIRROR=https://mirror.sanin.dev/arch-linux/\$repo/os/\$arch
RUN sed -i "1iServer = $MIRROR" /etc/pacman.d/mirrorlist && \
RUN cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak && \
sed -i "1iServer = $BUILDMIRROR" /etc/pacman.d/mirrorlist && \
pacman -Syu --noconfirm git clang sudo devtools vim bash-completion && \
pacman -Scc --noconfirm && \
rm -rf /var/lib/pacman/sync /var/cache/pacman/pkg && \
mv /etc/pacman.d/mirrorlist.bak /etc/pacman.d/mirrorlist && \
git config --global init.defaultBranch "master" && \
chmod +x /scripts/* && \
useradd -m user && \

View File

@@ -1,12 +1,16 @@
FROM artixlinux/artixlinux:base-devel
COPY scripts/entrypoint.sh /scripts/entrypoint.sh
COPY scripts/pacman.conf.artix/* /scripts/pacman.conf/
COPY scripts/pacman.conf.artix/pacman.conf.pl /scripts/pacman.conf.pl
ARG MIRROR=https://mirror.sanin.dev/artix-linux/\$repo/os/\$arch
ARG BUILDMIRROR=https://mirror.sanin.dev/artix-linux/\$repo/os/\$arch
RUN sed -i "1iServer = $MIRROR" /etc/pacman.d/mirrorlist && \
RUN cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak && \
sed -i "1iServer = $BUILDMIRROR" /etc/pacman.d/mirrorlist && \
pacman -Syu --noconfirm git clang sudo vim glibc openssh bash-completion && \
pacman -Scc --noconfirm && \
rm -rf /var/lib/pacman/sync /var/cache/pacman/pkg && \
mv /etc/pacman.d/mirrorlist.bak /etc/pacman.d/mirrorlist && \
git config --global init.defaultBranch "master" && \
chmod +x /scripts/* && \
useradd -m user && \

View File

@@ -1,15 +1,19 @@
#!/bin/sh
if [ -n "$DEP" ] && [ "$DEP" != "stable" ]
/scripts/pacman.conf.pl | sudo tee "/etc/pacman.conf" > /dev/null
if [ -n "$MIRROR" ]
then
sudo cp "/scripts/pacman.conf/pacman.$DEP.conf" "/etc/pacman.conf" && \
sudo pacman -Syu --noconfirm --noprogressbar
sudo sed -i "1iServer = $MIRROR" /etc/pacman.d/mirrorlist
fi
if [ -z "$REPO" ]
then
/bin/bash
exit $?;
else
sudo pacman -Syu --noconfirm --noprogressbar
fi
checkoutCommit() {
@@ -27,6 +31,21 @@ applyPatch() {
fi
}
postEntrypoint() {
if [ -n "$POST" ] && [ -x "./post-entrypoint.sh" ] ; then
echo "EXECUTING POSTENTRY"
./post-entrypoint.sh
fi
}
doBuild() {
if [ -n "$POST" ] && [ -x "./post-entrypoint.sh" ] ; then
makepkg -smf --noconfirm --noprogressbar --skippgpcheck
else
makepkg -smf --noconfirm --noprogressbar --skippgpcheck --noarchive
fi
}
changeDir() {
if [ -n "$CD" ]
then
@@ -34,11 +53,15 @@ changeDir() {
fi
}
# Clone the git repo
git clone "$REPO" /home/user/pkg && \
cd /home/user/pkg && \
DIR="${WORKSPACE:-/home/user/pkg}"
if [ ! -d "$DIR" ]; then
git clone "$REPO" "$DIR" || exit $?
fi
cd "$DIR" && \
checkoutCommit && \
applyPatch && \
sudo pacman -Syu --noconfirm --noprogressbar &&\
makepkg -smf --noconfirm --noprogressbar --skippgpcheck --noarchive
doBuild && \
postEntrypoint
exit $?;

View File

@@ -1,3 +1,12 @@
#!/usr/bin/env perl
use strict;
use warnings;
my $dep = $ENV{DEP} // 'stable';
my $tier = $ENV{TIER} // '1';
#region header
print <<'EOHEADER';
#
# /etc/pacman.conf
#
@@ -12,24 +21,61 @@ DownloadUser = alpm
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
EOHEADER
#endregion
#region core
if ($dep eq 'staging') {
print <<'EOCORESTAGING';
[core-staging]
Include = /etc/pacman.d/mirrorlist
EOCORESTAGING
}
if ($dep eq 'staging' || $dep eq 'testing') {
print <<'EOCORETESTING';
[core-testing]
Include = /etc/pacman.d/mirrorlist
EOCORETESTING
}
print <<'EOCORE';
[core]
Include = /etc/pacman.d/mirrorlist
EOCORE
#endregion
#region extra
if ($tier ne '0') {
if ($dep eq 'staging') {
print <<'EOEXTRASTAGING';
[extra-staging]
Include = /etc/pacman.d/mirrorlist
EOEXTRASTAGING
}
if ($dep eq 'staging' || $dep eq 'testing') {
print <<'EOEXTRATESTING';
[extra-testing]
Include = /etc/pacman.d/mirrorlist
EOEXTRATESTING
}
print <<'EOEXTRA';
[extra]
Include = /etc/pacman.d/mirrorlist
EOEXTRA
}
#endregion
#region options
print <<'EOOPTIONS';
[options]
NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/*
NoExtract = usr/share/gtk-doc/html/* usr/share/doc/*
@@ -42,4 +88,6 @@ NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/
NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
NoExtract = usr/share/man/* usr/share/info/*
NoExtract = usr/share/vim/vim*/lang/*
NoExtract = etc/pacman.conf etc/pacman.d/mirrorlist
NoExtract = etc/pacman.conf etc/pacman.d/mirrorlist
EOOPTIONS
#endregion

View File

@@ -1,40 +0,0 @@
#
# /etc/pacman.conf
#
[options]
HoldPkg = pacman glibc
Architecture = auto
NoProgressBar
VerbosePkgLists
ParallelDownloads = 5
DownloadUser = alpm
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
[core-testing]
Include = /etc/pacman.d/mirrorlist
[core]
Include = /etc/pacman.d/mirrorlist
[extra-testing]
Include = /etc/pacman.d/mirrorlist
[extra]
Include = /etc/pacman.d/mirrorlist
[options]
NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/*
NoExtract = usr/share/gtk-doc/html/* usr/share/doc/*
NoExtract = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
NoExtract = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
NoExtract = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
NoExtract = !usr/share/*locales/trans*
NoExtract = !usr/share/X11/locale/C/*
NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/*
NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
NoExtract = usr/share/man/* usr/share/info/*
NoExtract = usr/share/vim/vim*/lang/*
NoExtract = etc/pacman.conf etc/pacman.d/mirrorlist

View File

@@ -1,3 +1,12 @@
#!/usr/bin/env perl
use strict;
use warnings;
my $dep = $ENV{DEP} // 'stable';
my $tier = $ENV{TIER} // '1';
#region header
print <<'EOHEADER';
#
# /etc/pacman.conf
#
@@ -12,33 +21,87 @@ DownloadUser = alpm
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
EOHEADER
#endregion
#region system
if ($dep eq 'staging') {
print <<'EOSYSTEMSTAGING';
[system-goblins]
Include = /etc/pacman.d/mirrorlist
EOSYSTEMSTAGING
}
if ($dep eq 'staging' || $dep eq 'testing') {
print <<'EOSYSTEMTESTING';
[system-gremlins]
Include = /etc/pacman.d/mirrorlist
EOSYSTEMTESTING
}
print <<'EOSYSTEM';
[system]
Include = /etc/pacman.d/mirrorlist
EOSYSTEM
#endregion
#region world
if ($tier ne '0') {
if ($dep eq 'staging') {
print <<'EOWORLDSTAGING';
[world-goblins]
Include = /etc/pacman.d/mirrorlist
EOWORLDSTAGING
}
if ($dep eq 'staging' || $dep eq 'testing') {
print <<'EOWORLDTESTING';
[world-gremlins]
Include = /etc/pacman.d/mirrorlist
EOWORLDTESTING
}
print <<'EOWORLD';
[world]
Include = /etc/pacman.d/mirrorlist
EOWORLD
}
#endregion
#region galaxy
if ($tier eq '2') {
if ($dep eq 'staging') {
print <<'EOGALAXYSTAGING';
[galaxy-goblins]
Include = /etc/pacman.d/mirrorlist
EOGALAXYSTAGING
}
if ($dep eq 'staging' || $dep eq 'testing') {
print <<'EOGALAXYTESTING';
[galaxy-gremlins]
Include = /etc/pacman.d/mirrorlist
EOGALAXYTESTING
}
print <<'EOGALAXY';
[galaxy]
Include = /etc/pacman.d/mirrorlist
EOGALAXY
}
#endregion
#region options
print <<'EOOPTIONS';
[options]
NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/*
NoExtract = usr/share/gtk-doc/html/* usr/share/doc/*
@@ -50,4 +113,6 @@ NoExtract = !usr/share/X11/locale/C/*
NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/*
NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
NoExtract = usr/share/man/* usr/share/info/*
NoExtract = usr/share/vim/vim*/lang/*
NoExtract = usr/share/vim/vim*/lang/*
EOOPTIONS
#endregion

View File

@@ -1,44 +0,0 @@
#
# /etc/pacman.conf
#
[options]
HoldPkg = pacman glibc
Architecture = auto
NoProgressBar
VerbosePkgLists
ParallelDownloads = 5
DownloadUser = alpm
SigLevel = Required DatabaseOptional
LocalFileSigLevel = Optional
[system-gremlins]
Include = /etc/pacman.d/mirrorlist
[system]
Include = /etc/pacman.d/mirrorlist
[world-gremlins]
Include = /etc/pacman.d/mirrorlist
[world]
Include = /etc/pacman.d/mirrorlist
[galaxy-gremlins]
Include = /etc/pacman.d/mirrorlist
[galaxy]
Include = /etc/pacman.d/mirrorlist
[options]
NoExtract = usr/share/help/* !usr/share/help/en* !usr/share/help/C/*
NoExtract = usr/share/gtk-doc/html/* usr/share/doc/*
NoExtract = usr/share/locale/* usr/share/X11/locale/* usr/share/i18n/*
NoExtract = !*locale*/en*/* !usr/share/i18n/charmaps/UTF-8.gz !usr/share/*locale*/locale.*
NoExtract = !usr/share/*locales/en_?? !usr/share/*locales/i18n* !usr/share/*locales/iso*
NoExtract = !usr/share/*locales/trans*
NoExtract = !usr/share/X11/locale/C/*
NoExtract = !usr/share/X11/locale/compose.dir !usr/share/X11/locale/iso8859-1/*
NoExtract = !usr/share/*locales/C !usr/share/*locales/POSIX !usr/share/i18n/charmaps/ANSI_X3.4-1968.gz
NoExtract = usr/share/man/* usr/share/info/*
NoExtract = usr/share/vim/vim*/lang/*

58
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "archery",
"version": "0.2.2",
"version": "0.2.4",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "archery",
"version": "0.2.2",
"version": "0.2.4",
"license": "MIT",
"dependencies": {
"body-parser": "^2.2.0",
@@ -26,13 +26,13 @@
"@types/express": "^5.0.3",
"@types/express-session": "^1.18.2",
"@types/express-ws": "3.0.5",
"@types/node": "^24.5.2",
"@types/node": "^24.10.1",
"@types/passport": "1.0.17",
"@types/passport-openidconnect": "0.1.3",
"forking-build-shit": "1.0.4"
"forking-build-shit": "1.0.5"
},
"peerDependencies": {
"typescript": "5.7.3"
"typescript": "5.9.3"
}
},
"node_modules/@parcel/watcher": {
@@ -443,12 +443,12 @@
"license": "MIT"
},
"node_modules/@types/node": {
"version": "24.5.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.5.2.tgz",
"integrity": "sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==",
"version": "24.10.1",
"resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
"integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
"license": "MIT",
"dependencies": {
"undici-types": "~7.12.0"
"undici-types": "~7.16.0"
}
},
"node_modules/@types/oauth": {
@@ -934,6 +934,7 @@
"resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
"integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
"license": "MIT",
"peer": true,
"dependencies": {
"accepts": "^2.0.0",
"body-parser": "^2.2.0",
@@ -1097,14 +1098,14 @@
}
},
"node_modules/forking-build-shit": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/forking-build-shit/-/forking-build-shit-1.0.4.tgz",
"integrity": "sha512-pknWCgvJWSkP30sMllWzFxJhjFtXCRuILgYT1N7pJLAyI/SXQ0RXyhTcg+hjCnKaH4aVpxWUFUF2afwTDRO6RA==",
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/forking-build-shit/-/forking-build-shit-1.0.5.tgz",
"integrity": "sha512-b9HVQF1f2qXkgB+yTJe3U2kLfggvbUZjU1aqljI0E8O+sxo+cQH/HsyMGdHNPaUoMgSe/qfOsL6CPumu0jrrdg==",
"dev": true,
"license": "MIT",
"dependencies": {
"csso": "5.0.5",
"sass": "1.90.0",
"sass": "1.93.2",
"uglify-js": "3.19.3"
},
"bin": {
@@ -1250,9 +1251,9 @@
}
},
"node_modules/immutable": {
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.3.tgz",
"integrity": "sha512-+chQdDfvscSF1SJqv2gn4SRO2ZyS3xL3r7IW/wWEEzrzLisnOlKiQu5ytC/BVNcS15C39WT2Hg/bjKjDMcu+zg==",
"version": "5.1.4",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.4.tgz",
"integrity": "sha512-p6u1bG3YSnINT5RQmx/yRZBpenIl30kVxkTLDyHLIMk0gict704Q9n+thfDI7lTRm9vXdDYutVzXhzcThxTnXA==",
"dev": true,
"license": "MIT"
},
@@ -1607,6 +1608,7 @@
"resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
"integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
"license": "MIT",
"peer": true,
"dependencies": {
"pg-connection-string": "^2.9.1",
"pg-pool": "^3.10.1",
@@ -1896,9 +1898,9 @@
"license": "MIT"
},
"node_modules/sass": {
"version": "1.90.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.90.0.tgz",
"integrity": "sha512-9GUyuksjw70uNpb1MTYWsH9MQHOHY6kwfnkafC24+7aOMZn9+rVMBxRbLvw756mrBFbIsFg6Xw9IkR2Fnn3k+Q==",
"version": "1.93.2",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.93.2.tgz",
"integrity": "sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==",
"dev": true,
"license": "MIT",
"dependencies": {
@@ -2204,9 +2206,9 @@
}
},
"node_modules/typescript": {
"version": "5.7.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
"integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
"version": "5.9.3",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
"integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
"license": "Apache-2.0",
"peer": true,
"bin": {
@@ -2249,9 +2251,9 @@
"license": "MIT"
},
"node_modules/undici-types": {
"version": "7.12.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.12.0.tgz",
"integrity": "sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==",
"version": "7.16.0",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
"integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
"license": "MIT"
},
"node_modules/unpipe": {
@@ -2282,9 +2284,9 @@
}
},
"node_modules/validator": {
"version": "13.12.0",
"resolved": "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz",
"integrity": "sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==",
"version": "13.15.20",
"resolved": "https://registry.npmjs.org/validator/-/validator-13.15.20.tgz",
"integrity": "sha512-KxPOq3V2LmfQPP4eqf3Mq/zrT0Dqp2Vmx2Bn285LwVahLc+CsxOM0crBHczm8ijlcjZ0Q5Xd6LW3z3odTPnlrw==",
"license": "MIT",
"engines": {
"node": ">= 0.10"

View File

@@ -1,6 +1,6 @@
{
"name": "archery",
"version": "0.2.2",
"version": "0.2.4",
"description": "Build Arch packages through a web interface",
"keywords": [
"docker",
@@ -37,13 +37,13 @@
"@types/express": "^5.0.3",
"@types/express-session": "^1.18.2",
"@types/express-ws": "3.0.5",
"@types/node": "^24.5.2",
"@types/node": "^24.10.1",
"@types/passport": "1.0.17",
"@types/passport-openidconnect": "0.1.3",
"forking-build-shit": "1.0.4"
"forking-build-shit": "1.0.5"
},
"peerDependencies": {
"typescript": "5.7.3"
"typescript": "5.9.3"
},
"scripts": {
"build": "npx build-shit",

View File

@@ -15,6 +15,11 @@ interface BuildEvent {
message: any;
}
interface ControllerConfig {
"arch-mirror"?: string;
"artix-mirror"?: string;
}
function getContainerName(id: number) {
return `archery-build-${id}`;
}
@@ -24,9 +29,11 @@ class BuildController extends EventEmitter {
private running: boolean = false;
private interval: NodeJS.Timeout;
private cancelled: boolean = false;
private config: ControllerConfig;
constructor(config = {}) {
constructor(config: ControllerConfig = {}) {
super();
this.config = config;
// this.interval = setInterval(this.triggerBuild, 60000);
}
@@ -84,7 +91,7 @@ class BuildController extends EventEmitter {
}
private build = async (build: Build) => {
return new Promise<void>((resolve, reject) => {
return new Promise<void>((resolve, _) => {
const docker = spawn.spawn('docker', this.createBuildParams(build));
docker.on('spawn', () => {
const remainder = {
@@ -129,6 +136,7 @@ class BuildController extends EventEmitter {
}
private createBuildParams = (build: Build) => {
const customMirror = this.config?.[`${build.distro}-mirror`];
const params = ['run', '--rm', '-e', `REPO=${build.repo}`];
if (build.dependencies) {
params.push('-e', `DEP=${build.dependencies}`);
@@ -139,6 +147,9 @@ class BuildController extends EventEmitter {
if (build.patch) {
params.push('-e', `PATCH=${build.patch}`);
}
if (customMirror && typeof customMirror === 'string' && customMirror.length > 0) {
params.push('-e', `MIRROR=${customMirror}`);
}
params.push('--name', getContainerName(build.id));
params.push(docker_images[build.distro]);
return params;
@@ -188,4 +199,4 @@ class BuildController extends EventEmitter {
export default BuildController;
export { BuildController };
export type { BuildEvent, LogType };
export type { BuildEvent, LogType, ControllerConfig };

View File

@@ -5,16 +5,18 @@ import { DB } from './DB.ts';
import { BuildController } from './BuildController.ts';
import type { WebConfig } from './Web.ts';
import type { DBConfig } from './DB.ts';
import type { ControllerConfig } from './BuildController.ts';
interface compositeConfig {
web?: WebConfig,
db?: DBConfig
db?: DBConfig,
controller?: ControllerConfig,
}
const config: compositeConfig = JSON.parse(await fs.promises.readFile(process.env.config || process.env.CONFIG || path.join(process.cwd(), 'config', 'config.json'), 'utf-8'));
const web = new Web(config.web);
const buildController = new BuildController();
const buildController = new BuildController(config.controller);
await new Promise((resolve) => setTimeout(resolve, 1500));
const db = new DB(config.db);
web.setDB(db);