Compare commits
10 commits
main
...
runner-v1.
| Author | SHA1 | Date | |
|---|---|---|---|
| 4e0767b4d9 | |||
| 0c1a3bf0cf | |||
| 3702e7eec2 | |||
| b2967817d6 | |||
| a3a61146a3 | |||
| 6d8e6ea4c0 | |||
| c2be742094 | |||
| 9f5dae5707 | |||
| 4c249ff116 | |||
| 4a3219648d |
9 changed files with 317 additions and 17 deletions
54
.forgejo/actions/build-push-image/action.yaml
Normal file
54
.forgejo/actions/build-push-image/action.yaml
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
name: 'Build and Push Image'
|
||||
description: 'Build a container image with Buildah and push to zot registry'
|
||||
|
||||
# TODO: Investigate zot tag immutability to prevent overwriting released versions
|
||||
# See: https://zotregistry.dev/v2.1.1/articles/immutable-tags/
|
||||
|
||||
inputs:
|
||||
context:
|
||||
description: 'Build context path'
|
||||
required: true
|
||||
dockerfile:
|
||||
description: 'Dockerfile path (relative to context)'
|
||||
required: false
|
||||
default: 'Dockerfile'
|
||||
image_name:
|
||||
description: 'Image name (without registry, e.g. blumeops/devpi)'
|
||||
required: true
|
||||
version:
|
||||
description: 'Version tag (e.g. v1.0.0)'
|
||||
required: true
|
||||
registry:
|
||||
description: 'Registry URL'
|
||||
required: false
|
||||
default: 'registry.tail8d86e.ts.net'
|
||||
|
||||
runs:
|
||||
using: 'composite'
|
||||
steps:
|
||||
- name: Build image with Buildah
|
||||
shell: bash
|
||||
run: |
|
||||
echo "Building ${{ inputs.image_name }}:${{ inputs.version }}"
|
||||
buildah bud \
|
||||
--tag ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }} \
|
||||
--tag ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }} \
|
||||
--file ${{ inputs.context }}/${{ inputs.dockerfile }} \
|
||||
${{ inputs.context }}
|
||||
|
||||
- name: Push to registry
|
||||
shell: bash
|
||||
run: |
|
||||
echo "Pushing ${{ inputs.image_name }}:${{ inputs.version }}"
|
||||
buildah push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}
|
||||
buildah push ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}
|
||||
|
||||
- name: Summary
|
||||
shell: bash
|
||||
run: |
|
||||
echo "✅ Built and pushed:"
|
||||
echo " ${{ inputs.registry }}/${{ inputs.image_name }}:${{ inputs.version }}"
|
||||
echo " ${{ inputs.registry }}/${{ inputs.image_name }}:${{ github.sha }}"
|
||||
echo ""
|
||||
echo "Registry tags:"
|
||||
curl -sf "https://${{ inputs.registry }}/v2/${{ inputs.image_name }}/tags/list" | jq -r '.tags[]' | sort -V | tail -10
|
||||
37
.forgejo/workflows/build-devpi.yaml
Normal file
37
.forgejo/workflows/build-devpi.yaml
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
name: Build devpi
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'devpi-v*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version (e.g. v1.0.0)'
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Extract version from tag
|
||||
id: version
|
||||
run: |
|
||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
||||
VERSION="${{ github.event.inputs.version }}"
|
||||
else
|
||||
# Extract version from tag: devpi-v1.0.0 -> v1.0.0
|
||||
VERSION="${GITHUB_REF_NAME#devpi-}"
|
||||
fi
|
||||
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
|
||||
echo "Building version: $VERSION"
|
||||
|
||||
- name: Build and push
|
||||
uses: ./.forgejo/actions/build-push-image
|
||||
with:
|
||||
context: argocd/manifests/devpi
|
||||
image_name: blumeops/devpi
|
||||
version: ${{ steps.version.outputs.version }}
|
||||
37
.forgejo/workflows/build-runner.yaml
Normal file
37
.forgejo/workflows/build-runner.yaml
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
name: Build forgejo-runner
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'runner-v*'
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: 'Version (e.g. v1.0.0)'
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Extract version from tag
|
||||
id: version
|
||||
run: |
|
||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
||||
VERSION="${{ github.event.inputs.version }}"
|
||||
else
|
||||
# Extract version from tag: runner-v1.0.0 -> v1.0.0
|
||||
VERSION="${GITHUB_REF_NAME#runner-}"
|
||||
fi
|
||||
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
|
||||
echo "Building version: $VERSION"
|
||||
|
||||
- name: Build and push
|
||||
uses: ./.forgejo/actions/build-push-image
|
||||
with:
|
||||
context: argocd/manifests/forgejo-runner
|
||||
image_name: blumeops/forgejo-runner
|
||||
version: ${{ steps.version.outputs.version }}
|
||||
|
|
@ -23,14 +23,15 @@ jobs:
|
|||
git --version
|
||||
echo ""
|
||||
echo "=== Build tools ==="
|
||||
make --version | head -1
|
||||
gcc --version | head -1
|
||||
make --version 2>&1 | head -1 || true
|
||||
gcc --version 2>&1 | head -1 || true
|
||||
echo ""
|
||||
echo "=== Docker ==="
|
||||
docker --version
|
||||
echo "=== Container tools (Buildah) ==="
|
||||
buildah --version
|
||||
podman --version
|
||||
echo ""
|
||||
echo "=== Other tools ==="
|
||||
curl --version | head -1
|
||||
curl --version 2>&1 | head -1 || true
|
||||
jq --version
|
||||
|
||||
- name: Show repo info
|
||||
|
|
|
|||
|
|
@ -134,6 +134,13 @@ When migrating a service from indri to k8s, the Tailscale hostname must be freed
|
|||
|
||||
Use `ssh indri 'tailscale serve status --json'` to check current serve entries (the non-JSON output may be empty even when entries exist).
|
||||
|
||||
## Container Image Releases
|
||||
|
||||
```fish
|
||||
mise run container-list # Show containers and recent tags
|
||||
mise run container-release runner v1.0.0 # Tag and trigger build workflow
|
||||
```
|
||||
|
||||
## Third-Party Projects
|
||||
|
||||
When a task requires cloning or using a third-party git repository (e.g., for building from source), **ask the user to mirror it on forge first**, then clone from the mirror:
|
||||
|
|
|
|||
|
|
@ -1,29 +1,64 @@
|
|||
FROM code.forgejo.org/forgejo/runner:3.5.1
|
||||
# Build forgejo-runner from source
|
||||
# Source: https://forge.tail8d86e.ts.net/eblume/forgejo-runner (mirror of code.forgejo.org/forgejo/runner)
|
||||
|
||||
# Switch to root to install packages
|
||||
USER root
|
||||
FROM golang:1.24-alpine AS builder
|
||||
|
||||
# The base image is Alpine Linux
|
||||
# Install tools needed for GitHub Actions and builds
|
||||
ARG FORGEJO_RUNNER_VERSION=v3.5.1
|
||||
|
||||
RUN apk add --no-cache git make build-base
|
||||
|
||||
WORKDIR /src
|
||||
RUN git clone --depth 1 --branch ${FORGEJO_RUNNER_VERSION} \
|
||||
https://forge.tail8d86e.ts.net/eblume/forgejo-runner.git .
|
||||
|
||||
RUN make clean && make build
|
||||
|
||||
# Runtime image
|
||||
FROM alpine:3.21
|
||||
|
||||
# Create runner user with proper passwd entry (required by buildah)
|
||||
RUN addgroup -g 1000 runner && \
|
||||
adduser -D -u 1000 -G runner -h /data runner
|
||||
|
||||
# Install runtime dependencies
|
||||
RUN apk add --no-cache \
|
||||
# Required for actions/checkout and other Node-based actions
|
||||
nodejs \
|
||||
npm \
|
||||
# Build essentials
|
||||
# Core tools
|
||||
git \
|
||||
bash \
|
||||
curl \
|
||||
wget \
|
||||
jq \
|
||||
# Build essentials
|
||||
make \
|
||||
gcc \
|
||||
g++ \
|
||||
musl-dev \
|
||||
# For container builds
|
||||
ca-certificates \
|
||||
docker-cli
|
||||
# For container builds (daemonless, no Docker socket needed)
|
||||
buildah \
|
||||
podman \
|
||||
fuse-overlayfs \
|
||||
ca-certificates
|
||||
|
||||
# Copy runner binary from builder
|
||||
COPY --from=builder /src/forgejo-runner /bin/forgejo-runner
|
||||
|
||||
# Configure buildah for rootless operation
|
||||
RUN mkdir -p /etc/containers && \
|
||||
printf '[storage]\ndriver = "overlay"\nrunroot = "/tmp/containers-run"\ngraphroot = "/tmp/containers-storage"\n[storage.options.overlay]\nmount_program = "/usr/bin/fuse-overlayfs"\n' \
|
||||
> /etc/containers/storage.conf
|
||||
|
||||
# Configure registries (allow insecure for local registry)
|
||||
RUN printf 'unqualified-search-registries = ["docker.io"]\n[[registry]]\nlocation = "registry.tail8d86e.ts.net"\ninsecure = true\n' \
|
||||
> /etc/containers/registries.conf
|
||||
|
||||
# Verify tools are available
|
||||
RUN node --version && npm --version && docker --version
|
||||
RUN node --version && npm --version && buildah --version && /bin/forgejo-runner --version
|
||||
|
||||
# Switch back to non-root user
|
||||
USER 1000
|
||||
ENV HOME=/data
|
||||
WORKDIR /data
|
||||
USER runner
|
||||
|
||||
CMD ["/bin/forgejo-runner"]
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ spec:
|
|||
containers:
|
||||
- name: runner
|
||||
image: registry.tail8d86e.ts.net/blumeops/forgejo-runner:latest
|
||||
imagePullPolicy: Always
|
||||
env:
|
||||
# Use internal k8s service via Tailscale operator egress
|
||||
- name: FORGEJO_INSTANCE_URL
|
||||
|
|
|
|||
53
mise-tasks/container-list
Executable file
53
mise-tasks/container-list
Executable file
|
|
@ -0,0 +1,53 @@
|
|||
#!/usr/bin/env bash
|
||||
#MISE description="List available containers and their recent tags"
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
REGISTRY="registry.tail8d86e.ts.net"
|
||||
WORKFLOW_DIR=".forgejo/workflows"
|
||||
|
||||
echo "Container Images"
|
||||
echo "================"
|
||||
echo ""
|
||||
|
||||
# Find all build-*.yaml workflows
|
||||
for workflow in "$WORKFLOW_DIR"/build-*.yaml; do
|
||||
[[ -f "$workflow" ]] || continue
|
||||
|
||||
# Extract container name from filename: build-runner.yaml -> runner
|
||||
filename=$(basename "$workflow")
|
||||
container="${filename#build-}"
|
||||
container="${container%.yaml}"
|
||||
|
||||
# Skip if not a container build workflow (check for image_name)
|
||||
if ! grep -q "image_name:" "$workflow" 2>/dev/null; then
|
||||
continue
|
||||
fi
|
||||
|
||||
# Extract image name from workflow
|
||||
image=$(grep -E "^\s+image_name:" "$workflow" | head -1 | awk '{print $2}')
|
||||
|
||||
echo "📦 $container"
|
||||
echo " Image: $REGISTRY/$image"
|
||||
echo " Workflow: $workflow"
|
||||
|
||||
# Query zot for recent tags
|
||||
tags=$(curl -sf "https://$REGISTRY/v2/$image/tags/list" 2>/dev/null | jq -r '.tags // [] | .[]' | grep -E '^v[0-9]' | sort -V | tail -4 || true)
|
||||
|
||||
if [[ -n "$tags" ]]; then
|
||||
echo " Recent tags:"
|
||||
echo "$tags" | while read -r tag; do
|
||||
echo " - $tag"
|
||||
done
|
||||
else
|
||||
echo " Recent tags: (none)"
|
||||
fi
|
||||
echo ""
|
||||
done
|
||||
|
||||
echo "---"
|
||||
echo "To release a new version:"
|
||||
echo " mise run container-release <container> <version>"
|
||||
echo ""
|
||||
echo "Example:"
|
||||
echo " mise run container-release runner v1.0.0"
|
||||
75
mise-tasks/container-release
Executable file
75
mise-tasks/container-release
Executable file
|
|
@ -0,0 +1,75 @@
|
|||
#!/usr/bin/env bash
|
||||
#MISE description="Release a container image by creating a git tag"
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
CONTAINER="${1:-}"
|
||||
VERSION="${2:-}"
|
||||
|
||||
if [[ -z "$CONTAINER" || -z "$VERSION" ]]; then
|
||||
echo "Usage: mise run container-release <container> <version>"
|
||||
echo ""
|
||||
echo "Run 'mise run container-list' to see available containers and recent tags."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Validate version format
|
||||
if [[ ! "$VERSION" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
echo "Error: Version must be in format vX.Y.Z (e.g. v1.0.0)"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
TAG="${CONTAINER}-${VERSION}"
|
||||
|
||||
echo "Creating release tag: $TAG"
|
||||
echo ""
|
||||
|
||||
# Check if tag already exists
|
||||
if git rev-parse "$TAG" >/dev/null 2>&1; then
|
||||
echo "Error: Tag '$TAG' already exists"
|
||||
echo "Existing tags for $CONTAINER:"
|
||||
git tag -l "${CONTAINER}-v*" | sort -V | tail -5
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Find the workflow file to determine image name
|
||||
WORKFLOW_FILE=".forgejo/workflows/build-${CONTAINER}.yaml"
|
||||
if [[ ! -f "$WORKFLOW_FILE" ]]; then
|
||||
echo "Error: No workflow found for container '$CONTAINER'"
|
||||
echo ""
|
||||
echo "Run 'mise run container-list' to see available containers."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Extract image name from workflow
|
||||
IMAGE=$(grep -E "^\s+image_name:" "$WORKFLOW_FILE" | head -1 | awk '{print $2}')
|
||||
if [[ -z "$IMAGE" ]]; then
|
||||
echo "Error: Could not determine image name from $WORKFLOW_FILE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Container: $CONTAINER"
|
||||
echo "Workflow: $WORKFLOW_FILE"
|
||||
echo "Image: registry.tail8d86e.ts.net/$IMAGE:$VERSION"
|
||||
echo ""
|
||||
|
||||
# Confirm
|
||||
read -p "Create tag and push? [y/N] " -n 1 -r
|
||||
echo
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||
echo "Aborted."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Create and push tag
|
||||
git tag "$TAG"
|
||||
git push origin "$TAG"
|
||||
|
||||
echo ""
|
||||
echo "✅ Tag '$TAG' created and pushed"
|
||||
echo ""
|
||||
echo "The workflow will now build and push:"
|
||||
echo " registry.tail8d86e.ts.net/$IMAGE:$VERSION"
|
||||
echo ""
|
||||
echo "Monitor the build at:"
|
||||
echo " https://forge.tail8d86e.ts.net/eblume/blumeops/actions"
|
||||
Loading…
Add table
Add a link
Reference in a new issue