viktor/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

offinfra-onboard: --dockerfile flag for non-root Dockerfiles
All checks were successful
ci/woodpecker/push/default Pipeline was successful
Details
ci/woodpecker/push/build-cli Pipeline was successful
Details

Browse source 
claude-memory-mcp's Dockerfile is at docker/Dockerfile, not repo root
(infra#20 build failed: 'open Dockerfile: no such file or directory').
build.yml template gains file: {{DOCKERFILE}} (default ./Dockerfile).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Viktor Barzin 2026-06-13 02:37:25 +00:00
parent 3960eac716
commit bdea34b992
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/offinfra-onboard
View file

@ -16,7 +16,7 @@
# Usage: # Usage:
# offinfra-onboard <name> --clone <path> --visibility private|public \ # offinfra-onboard <name> --clone <path> --visibility private|public \
# --namespace <ns> --deploy "<deployment>=<container>[,<container>...]" \ # --namespace <ns> --deploy "<deployment>=<container>[,<container>...]" \
# [--image <ghcr-image-name>] [--context <docker-context>] \ # [--image <ghcr-image-name>] [--context <docker-context>] [--dockerfile <path>] \
# [--test-steps <yaml-file>] [--dry-run] # [--test-steps <yaml-file>] [--dry-run]
# #
# --deploy is repeatable. --test-steps points at a YAML fragment of extra # --deploy is repeatable. --test-steps points at a YAML fragment of extra
@ -32,7 +32,7 @@ FORGEJO_LB="10.0.20.203"
WP_API="https://ci.viktorbarzin.me/api" WP_API="https://ci.viktorbarzin.me/api"
NAME=${1:?usage: offinfra-onboard <name> [flags]}; shift NAME=${1:?usage: offinfra-onboard <name> [flags]}; shift
CLONE="" VISIBILITY="" NAMESPACE="" IMAGE="" CONTEXT="." TEST_STEPS_FILE="" DRY_RUN=0 NO_DEPLOY=0 CLONE="" VISIBILITY="" NAMESPACE="" IMAGE="" CONTEXT="." DOCKERFILE="Dockerfile" TEST_STEPS_FILE="" DRY_RUN=0 NO_DEPLOY=0
DEPLOYS=() DEPLOYS=()
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
@ -41,6 +41,7 @@ while [ $# -gt 0 ]; do
--namespace) NAMESPACE=$2; shift 2;; --namespace) NAMESPACE=$2; shift 2;;
--image) IMAGE=$2; shift 2;; --image) IMAGE=$2; shift 2;;
--context) CONTEXT=$2; shift 2;; --context) CONTEXT=$2; shift 2;;
--dockerfile) DOCKERFILE=$2; shift 2;;
--deploy) DEPLOYS+=("$2"); shift 2;; --deploy) DEPLOYS+=("$2"); shift 2;;
--test-steps) TEST_STEPS_FILE=$2; shift 2;; --test-steps) TEST_STEPS_FILE=$2; shift 2;;
--no-deploy) NO_DEPLOY=1; shift;; --no-deploy) NO_DEPLOY=1; shift;;
@ -172,7 +173,7 @@ else
TEST_STEPS=' - run: echo "no test steps configured"' TEST_STEPS=' - run: echo "no test steps configured"'
fi fi
export T_NAME=$NAME T_IMAGE=$IMAGE T_CONTEXT=$CONTEXT T_WPID=$WP_REPO_ID T_TEST="$TEST_STEPS" T_DEPLOY="$DEPLOY_CMDS" export T_NAME=$NAME T_IMAGE=$IMAGE T_CONTEXT=$CONTEXT T_DOCKERFILE=$DOCKERFILE T_WPID=$WP_REPO_ID T_TEST="$TEST_STEPS" T_DEPLOY="$DEPLOY_CMDS"
render() { # $1=template $2=dest render() { # $1=template $2=dest
python3 - "$1" "$2" <<'PYEOF' python3 - "$1" "$2" <<'PYEOF'
import os, sys import os, sys
@ -181,6 +182,7 @@ s = open(src).read()
s = s.replace('{{NAME}}', os.environ['T_NAME']) s = s.replace('{{NAME}}', os.environ['T_NAME'])
s = s.replace('{{IMAGE}}', os.environ['T_IMAGE']) s = s.replace('{{IMAGE}}', os.environ['T_IMAGE'])
s = s.replace('{{CONTEXT}}', os.environ['T_CONTEXT']) s = s.replace('{{CONTEXT}}', os.environ['T_CONTEXT'])
s = s.replace('{{DOCKERFILE}}', os.environ['T_DOCKERFILE'])
s = s.replace('{{WP_REPO_ID}}', os.environ['T_WPID']) s = s.replace('{{WP_REPO_ID}}', os.environ['T_WPID'])
s = s.replace('{{TEST_STEPS}}', os.environ['T_TEST']) s = s.replace('{{TEST_STEPS}}', os.environ['T_TEST'])
s = s.replace('{{DEPLOY_CMDS}}', os.environ['T_DEPLOY'].replace('\\n', '\n').rstrip('\n')) s = s.replace('{{DEPLOY_CMDS}}', os.environ['T_DEPLOY'].replace('\\n', '\n').rstrip('\n'))

1
scripts/offinfra-templates/build.yml.tmpl
View file

@ -63,6 +63,7 @@ jobs:
- uses: docker/build-push-action@v7 - uses: docker/build-push-action@v7
with: with:
context: {{CONTEXT}} context: {{CONTEXT}}
file: {{DOCKERFILE}}
push: true push: true
platforms: linux/amd64 platforms: linux/amd64
# Single-manifest images (no provenance/SBOM attestation children) so # Single-manifest images (no provenance/SBOM attestation children) so