refactor: consolidate CI and local dev orchestration (#108)
## Summary - Extract shared bootstrap functions into `scripts/bootstrap-common.sh` (eliminates ~120 lines of duplicated forge/cast commands from e2e.yml) - Create reusable `scripts/wait-for-service.sh` for health checks (replaces 60-line inline wait-for-stack) - Merge dev and CI entrypoints into unified scripts branching on `CI` env var (delete `docker/ci-entrypoints/`) - Replace 4 per-service CI Dockerfiles with parameterized `docker/Dockerfile.service-ci` - Add `sync-tax-rates.mjs` to CI image builder stage - Fix: CI now grants txnBot recenter access (was missing) - Fix: txnBot funding parameterized (CI=10eth, local=1eth) - Delete 5 obsolete migration docs and 4 DinD integration files Net: -1540 lines removed Closes #107 ## Test plan - [ ] E2E pipeline passes (bootstrap sources shared script, services use old images with commands override) - [ ] build-ci-images pipeline builds all 4 services with unified Dockerfile - [ ] Local dev stack boots via `./scripts/dev.sh start` 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: openhands <openhands@all-hands.dev> Reviewed-on: https://codeberg.org/johba/harb/pulls/108
This commit is contained in:
parent
4277f19b68
commit
e5e1308e72
45 changed files with 882 additions and 2627 deletions
|
|
@ -13,14 +13,18 @@ when:
|
|||
path:
|
||||
include:
|
||||
- .woodpecker/build-ci-images.yml
|
||||
- docker/Dockerfile.*-ci
|
||||
- docker/ci-entrypoints/**
|
||||
- docker/Dockerfile.service-ci
|
||||
- docker/Dockerfile.node-ci
|
||||
- containers/*-entrypoint.sh
|
||||
- containers/entrypoint-common.sh
|
||||
- kraiken-lib/**
|
||||
- onchain/**
|
||||
- services/ponder/**
|
||||
- services/txnBot/**
|
||||
- web-app/**
|
||||
- landing/**
|
||||
- scripts/sync-tax-rates.mjs
|
||||
- scripts/bootstrap-common.sh
|
||||
|
||||
steps:
|
||||
# Compile Solidity contracts to generate ABI files needed by Dockerfiles
|
||||
|
|
@ -28,7 +32,7 @@ steps:
|
|||
image: registry.niovi.voyage/harb/node-ci:latest
|
||||
commands:
|
||||
- |
|
||||
bash -lc '
|
||||
bash -c '
|
||||
set -euo pipefail
|
||||
# Initialize git submodules (required for forge dependencies)
|
||||
git submodule update --init --recursive
|
||||
|
|
@ -56,54 +60,85 @@ steps:
|
|||
# Login to registry
|
||||
echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY" -u "$REGISTRY_USER" --password-stdin
|
||||
|
||||
SHA="${CI_COMMIT_SHA:0:7}"
|
||||
|
||||
# Build and push node-ci (base image with Foundry pre-installed)
|
||||
echo "=== Building node-ci ==="
|
||||
docker build \
|
||||
-f docker/Dockerfile.node-ci \
|
||||
-t "$REGISTRY/harb/node-ci:${CI_COMMIT_SHA:0:7}" \
|
||||
-t "$REGISTRY/harb/node-ci:$SHA" \
|
||||
-t "$REGISTRY/harb/node-ci:latest" \
|
||||
.
|
||||
docker push "$REGISTRY/harb/node-ci:${CI_COMMIT_SHA:0:7}"
|
||||
docker push "$REGISTRY/harb/node-ci:$SHA"
|
||||
docker push "$REGISTRY/harb/node-ci:latest"
|
||||
|
||||
# Build and push ponder-ci
|
||||
# Build and push ponder-ci (unified Dockerfile)
|
||||
echo "=== Building ponder-ci ==="
|
||||
docker build \
|
||||
-f docker/Dockerfile.ponder-ci \
|
||||
-t "$REGISTRY/harb/ponder-ci:${CI_COMMIT_SHA:0:7}" \
|
||||
-f docker/Dockerfile.service-ci \
|
||||
--build-arg SERVICE_DIR=services/ponder \
|
||||
--build-arg SERVICE_PORT=42069 \
|
||||
--build-arg ENTRYPOINT_SCRIPT=containers/ponder-entrypoint.sh \
|
||||
--build-arg HEALTHCHECK_RETRIES=12 \
|
||||
--build-arg HEALTHCHECK_START=20s \
|
||||
--build-arg NEEDS_SYMLINKS=false \
|
||||
-t "$REGISTRY/harb/ponder-ci:$SHA" \
|
||||
-t "$REGISTRY/harb/ponder-ci:latest" \
|
||||
.
|
||||
docker push "$REGISTRY/harb/ponder-ci:${CI_COMMIT_SHA:0:7}"
|
||||
docker push "$REGISTRY/harb/ponder-ci:$SHA"
|
||||
docker push "$REGISTRY/harb/ponder-ci:latest"
|
||||
|
||||
# Build and push webapp-ci
|
||||
# Build and push webapp-ci (unified Dockerfile)
|
||||
echo "=== Building webapp-ci ==="
|
||||
docker build \
|
||||
-f docker/Dockerfile.webapp-ci \
|
||||
-t "$REGISTRY/harb/webapp-ci:${CI_COMMIT_SHA:0:7}" \
|
||||
-f docker/Dockerfile.service-ci \
|
||||
--build-arg SERVICE_DIR=web-app \
|
||||
--build-arg SERVICE_PORT=5173 \
|
||||
--build-arg HEALTHCHECK_PATH=/app/ \
|
||||
--build-arg HEALTHCHECK_RETRIES=84 \
|
||||
--build-arg HEALTHCHECK_START=15s \
|
||||
--build-arg ENTRYPOINT_SCRIPT=containers/webapp-entrypoint.sh \
|
||||
--build-arg NODE_ENV=development \
|
||||
--build-arg NEEDS_SYMLINKS=true \
|
||||
-t "$REGISTRY/harb/webapp-ci:$SHA" \
|
||||
-t "$REGISTRY/harb/webapp-ci:latest" \
|
||||
.
|
||||
docker push "$REGISTRY/harb/webapp-ci:${CI_COMMIT_SHA:0:7}"
|
||||
docker push "$REGISTRY/harb/webapp-ci:$SHA"
|
||||
docker push "$REGISTRY/harb/webapp-ci:latest"
|
||||
|
||||
# Build and push landing-ci
|
||||
# Build and push landing-ci (unified Dockerfile)
|
||||
echo "=== Building landing-ci ==="
|
||||
docker build \
|
||||
-f docker/Dockerfile.landing-ci \
|
||||
-t "$REGISTRY/harb/landing-ci:${CI_COMMIT_SHA:0:7}" \
|
||||
-f docker/Dockerfile.service-ci \
|
||||
--build-arg SERVICE_DIR=landing \
|
||||
--build-arg SERVICE_PORT=5174 \
|
||||
--build-arg ENTRYPOINT_SCRIPT=containers/landing-ci-entrypoint.sh \
|
||||
--build-arg NODE_ENV=development \
|
||||
--build-arg HEALTHCHECK_RETRIES=6 \
|
||||
--build-arg HEALTHCHECK_START=10s \
|
||||
--build-arg NEEDS_SYMLINKS=false \
|
||||
-t "$REGISTRY/harb/landing-ci:$SHA" \
|
||||
-t "$REGISTRY/harb/landing-ci:latest" \
|
||||
.
|
||||
docker push "$REGISTRY/harb/landing-ci:${CI_COMMIT_SHA:0:7}"
|
||||
docker push "$REGISTRY/harb/landing-ci:$SHA"
|
||||
docker push "$REGISTRY/harb/landing-ci:latest"
|
||||
|
||||
# Build and push txnbot-ci
|
||||
# Build and push txnbot-ci (unified Dockerfile)
|
||||
echo "=== Building txnbot-ci ==="
|
||||
docker build \
|
||||
-f docker/Dockerfile.txnbot-ci \
|
||||
-t "$REGISTRY/harb/txnbot-ci:${CI_COMMIT_SHA:0:7}" \
|
||||
-f docker/Dockerfile.service-ci \
|
||||
--build-arg SERVICE_DIR=services/txnBot \
|
||||
--build-arg SERVICE_PORT=43069 \
|
||||
--build-arg HEALTHCHECK_PATH=/status \
|
||||
--build-arg HEALTHCHECK_RETRIES=4 \
|
||||
--build-arg HEALTHCHECK_START=10s \
|
||||
--build-arg ENTRYPOINT_SCRIPT=containers/txnbot-entrypoint.sh \
|
||||
--build-arg NPM_INSTALL_CMD=install \
|
||||
--build-arg NEEDS_SYMLINKS=false \
|
||||
-t "$REGISTRY/harb/txnbot-ci:$SHA" \
|
||||
-t "$REGISTRY/harb/txnbot-ci:latest" \
|
||||
.
|
||||
docker push "$REGISTRY/harb/txnbot-ci:${CI_COMMIT_SHA:0:7}"
|
||||
docker push "$REGISTRY/harb/txnbot-ci:$SHA"
|
||||
docker push "$REGISTRY/harb/txnbot-ci:latest"
|
||||
|
||||
echo "=== All CI images built and pushed ==="
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue