| Age | Commit message (Collapse) | Author |
|
|
|
The header comments in bnw-container.scm, cgit-container.scm,
bnw-vm.scm and cgit-vm.scm used factory/code/... paths that break on
other checkouts (balg01 uses ~/guix/...). All build/run examples now
use $base = a directory holding the checkouts side by side, with a
note to adapt to the local layout; the stale factory/... comment in
run-guix-container's container files and the remaining cgit-README
reference in the test runner are fixed too.
The test runners rename $FACTORY to $base and make every checkout
path overridable (GUIX_BIOINF, GN_MACHINES, GUIX_FORGE,
RUN_GUIX_CONTAINER default to $base/code/<checkout> for the factory
layout). Verified both ways on this machine: default layout and
fully explicit overrides both pass the bnw suite (13/13).
|
|
The container OS definitions move from genenetwork/services to
genenetwork/containers to keep services (reusable service-types and
procedures: bnw.scm, cgit.scm, container-ssh.scm) apart from the
concrete containers that instantiate them. The modules rename to
(genenetwork containers bnw-container) and (genenetwork containers
cgit-container); container-ssh stays in services -- it provides
services, the containers consume them.
Path/module references updated: both test runners, cgit-README.md and
the bnw-vm.scm header comment.
Pure move: guix system container resolves to the exact same store
paths as before (bnw 3jiirryqwjb..., cgit zga020ym4y3...). Both
containers rebuilt and re-tested: bnw suite 13/13 green; cgit Anubis
tests and tool checks green (t01-t16 still need the host-side
/srv/git provisioning, unchanged).
|
|
|
|
(genenetwork services bnw) now holds the bnw/bnw-nginx service
definitions (records, activation, foreground-nginx shepherd service,
accounts, conf generator); it also extends the system profile with
graphviz (the network-layout php pages call /usr/bin/dot), so both
the container and the VM carry dot in their closure.
bnw-container.scm shrinks to the container OS itself (pinned ssh
host key, /var/empty, no-op sysctl/udev); bnw-vm.scm imports the
shared module directly and aligns its packages with the container
(grep, procps). Verified: container builds, 25/25 HTTP tests pass;
VM image builds, boots, BNW data dir initialized.
|
|
Alternative to bnw-container.scm for public deployments: a qcow2 disk
image contains only the system's closure (no host /gnu/store mount),
the disk is writable so state survives reboots, and RAM is bounded
explicitly (run qemu with -m 2048; peak during an 8-node
structure-learning run is ~210 MiB).
The BNW services (bnw-service-type, bnw-nginx-service-type) are
imported from (genenetwork services bnw-container), which now exports
them; the OS uses real VM plumbing (grub + Guix_image root label,
%qemu-static-networking, serial console, ssh with the pinned client
key; host keys are generated at first boot and persist in the
writable image). User-visible ports: web 8881, ssh 22 (forward with
hostfwd).
Verified: image builds, boots under qemu (-m 2048), BNW serves HTTP
200 on 8881 and the workflow.php example loads.
|