From c012374cf122647f783388f52b01431f0f04d63c Mon Sep 17 00:00:00 2001 From: Quintine <15965533+Quintine@users.noreply.github.com> Date: Fri, 20 Nov 2026 17:31:35 +1100 Subject: [PATCH] Run Dune verification on the Gitea job network --- .gitea/workflows/container.yml | 2 ++ tools/verify-container.mjs | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/container.yml b/.gitea/workflows/container.yml index afec235c..b2229ac5 100644 --- a/.gitea/workflows/container.yml +++ b/.gitea/workflows/container.yml @@ -34,6 +34,8 @@ jobs: load: true tags: dune:verify - name: Verify isolated storage and HTTP behavior + env: + DUNE_VERIFY_NETWORK: ${{ job.container.network }} run: node tools/verify-container.mjs dune:verify - name: Configure container registry if: github.ref == 'refs/heads/main' diff --git a/tools/verify-container.mjs b/tools/verify-container.mjs index cc1b49c0..ea848cc1 100644 --- a/tools/verify-container.mjs +++ b/tools/verify-container.mjs @@ -13,6 +13,11 @@ if (!image) throw new Error('Usage: node tools/verify-container.mjs IMAGE'); const name = `dune-verify-${randomUUID()}`; const volume = `${name}-data`; const docker = (...args) => execFileSync('docker', args, { encoding: 'utf8' }).trim(); +const jobNetwork = process.env.DUNE_VERIFY_NETWORK; +const useJobNetwork = jobNetwork && jobNetwork !== 'host'; +const endpoint = () => useJobNetwork + ? `http://${name}:3000` + : `http://${docker('port', name, '3000/tcp')}`; let base; const adminFiles = mkdtempSync(joinPath(tmpdir(), 'dune-admin-container-')); let adminCookie; @@ -34,11 +39,12 @@ async function ready() { throw new Error('Container did not become ready'); } function start(publicOrigin = '') { + const networkArgs = useJobNetwork ? ['--network', jobNetwork] : ['-p', '127.0.0.1::3000']; docker('run', '-d', '--name', name, '--init', '--cap-drop=ALL', '--security-opt=no-new-privileges:true', - '-p', '127.0.0.1::3000', '-v', `${volume}:/data`, + ...networkArgs, '-v', `${volume}:/data`, '-e', `DUNE_PUBLIC_ORIGIN=${publicOrigin}`, image); - base = `http://${docker('port', name, '3000/tcp')}`; + base = endpoint(); } const bootstrapKeys = (logs) => logs.match(/dune-admin\.[0-9a-f-]{36}\.[0-9a-f]{64}/g) || []; function checkBootstrap(count) { @@ -95,7 +101,7 @@ try { stage = 'container restart and saved witnesses'; docker('restart', '--time', '60', name); // Docker may assign a different ephemeral host port after a restart. - base = `http://${docker('port', name, '3000/tcp')}`; + base = endpoint(); await ready(); assert.equal(checkBootstrap(1), bootstrapKey, 'Restart must not replace the owner key'); await restored();