devenv: Add opencode and rsync, drop duplicate code

devenv/.dockerignore

@@ -7,6 +7,7 @@
 !packages-common.txt
 !packages-debian.txt
 !packages-c10s.txt
+!npm.txt
 !build-deps.txt
 !build-deps-debian.txt
 !build-deps-c10s.txt

devenv/Containerfile.c10s

@@ -1,7 +1,7 @@
 # These aren't packages, just low-dependency binaries dropped in /usr/local/bin
 # so we can fetch them independently in a separate build.
 ARG base=quay.io/centos/centos:stream10
 FROM $base as base
 # Life is too short to care about dash
 RUN ln -sfr /bin/bash /bin/sh
 RUN <<EORUN
@@ -25,7 +25,7 @@
 dnf -y makecache
 EORUN
 
 FROM base as tools
 # renovate: datasource=github-releases depName=block/goose
 ARG gooseversion=v1.11.1
 # renovate: datasource=github-releases depName=bootc-dev/bcvk
@@ -36,12 +36,14 @@
 
 rm -vrf /usr/local/bin/*
 
-# goose for local AI
+# goose is a single static binary
 target=goose-${arch}-unknown-linux-gnu.tar.bz2
 /bin/time -f '%E %C' curl -fLO https://github.com/block/goose/releases/download/$gooseversion/$target
 tar xvjf $target
 mv goose /usr/local/bin/goose
 
+## Other tools
+
 # bcvk
 if test "${arch}" = x86_64; then
   td=$(mktemp -d)
@@ -58,7 +60,7 @@
 fi
 EORUN
 
 FROM base as rust
 RUN <<EORUN
 set -xeuo pipefail
 # Setup rust; the idea here though is we install system-wide into /usr/local
@@ -84,6 +86,8 @@
 grep -vEe '^#' build-deps-c10s.txt | /bin/time -f '%E %C' xargs dnf -y builddep
 dnf clean all
 EORUN
+COPY npm.txt /run/src
+RUN grep -vEe '^#' npm.txt | /bin/time -f '%E %C' xargs npm i -g
 
 # Copy in the binaries from our tools container image
 COPY --from=tools /usr/local/bin/* /usr/local/bin/

devenv/Containerfile.debian

@@ -1,7 +1,7 @@
 # These aren't packages, just low-dependency binaries dropped in /usr/local/bin
 # so we can fetch them independently in a separate build.
 ARG base=docker.io/library/debian:sid
 FROM $base as base
 # Life is too short to care about dash
 RUN ln -sfr /bin/bash /bin/sh
 RUN <<EORUN
@@ -25,7 +25,7 @@
 apt -y update
 EORUN
 
 FROM base as tools
 # renovate: datasource=github-releases depName=block/goose
 ARG gooseversion=v1.11.1
 # renovate: datasource=github-releases depName=bootc-dev/bcvk
@@ -58,7 +58,7 @@
 fi
 EORUN
 
 FROM base as rust
 RUN <<EORUN
 set -xeuo pipefail
 # Setup rust; the idea here though is we install system-wide into /usr/local
@@ -84,6 +84,8 @@
 grep -vEe '^#' build-deps-debian.txt | /bin/time -f '%E %C' xargs apt -y build-dep
 apt clean && rm -rf /var/lib/apt/lists/*
 EORUN
+COPY npm.txt /run/src
+RUN grep -vEe '^#' npm.txt | /bin/time -f '%E %C' xargs npm i -g
 
 # Copy in the binaries from our tools container image
 COPY --from=tools /usr/local/bin/* /usr/local/bin/

devenv/npm.txt

@@ -0,0 +1,2 @@
+# renovate: datasource=npm depName=opencode-ai
+opencode-ai@1.0.163

devenv/packages-common.txt

@@ -7,6 +7,7 @@ sudo
 
 # Generic utilities
 acl
+rsync
 
 # General build env (note: we install rust through rustup later)
 gcc