2 Commits

Author SHA1 Message Date
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
9 changed files with 162 additions and 100 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() {
@@ -34,6 +38,14 @@ postEntrypoint() {
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
@@ -50,6 +62,6 @@ cd "$DIR" && \
checkoutCommit && \
applyPatch && \
sudo pacman -Syu --noconfirm --noprogressbar &&\
makepkg -smf --noconfirm --noprogressbar --skippgpcheck && \
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/*

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);
}
@@ -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);