didericis/bot-bottle
1
0
Fork 0
Code Issues 5 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Cleanup backend and agent provider abstractions #216

Merged
didericis merged 21 commits from issue-215-dockerfile-colocation into main 2026-06-08 23:01:36 -04:00
Conversation 20 Commits 21 Files Changed 66
+2 -5
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7bc59054b - Show all commits
bot_bottle/backend/docker/prepare.py
+1 -1
View File
2
 @@ -110,7 +110,7 @@ def resolve_plan(
dockerfile_path = str(p_dockerfile)
didericis marked this conversation as resolved Outdated
didericis commented 2026-06-08 02:12:20 -04:00
Outdated
Review
Copy Link
Copy Source

This rename used to make sense, but not anymore: places where we're assigning image_default should be changed so we assign to image and we should just remove this image = image_default assignment.

This rename used to make sense, but not anymore: places where we're assigning `image_default` should be changed so we assign to `image` and we should just remove this `image = image_default` assignment.
else:
image_default = provider_runtime.image
image = os.environ.get("BOT_BOTTLE_IMAGE", image_default)
image = image_default
didericis marked this conversation as resolved Outdated
didericis commented 2026-06-08 00:01:39 -04:00
Outdated
Review
Copy Link
Copy Source

Are we using this anywhere? Not sure if it's worth keeping this. If it's being used should be renamed to BOT_BOTTLE_AGENT_IMAGE.

Are we using this anywhere? Not sure if it's worth keeping this. If it's being used should be renamed to `BOT_BOTTLE_AGENT_IMAGE`.
derived_image = ""
runtime_image = image
if spec.copy_cwd:
bot_bottle/backend/smolmachines/prepare.py
+1 -4
View File
@@ -116,9 +116,6 @@ def resolve_plan(
prompt_file.chmod(0o600)
machine_name = f"bot-bottle-{slug}"
# Stash the agent image ref — `launch.launch` runs the
# build → pack pipeline at bringup. Honors BOT_BOTTLE_IMAGE
# to match the docker backend's `resolve_plan` default.
agent_dockerfile_path = ""
if provider.dockerfile:
agent_dockerfile_path = _resolve_manifest_dockerfile(provider.dockerfile, spec)
@@ -133,7 +130,7 @@ def resolve_plan(
image_default = f"bot-bottle-{provider.template}:{slug}"
else:
image_default = provider_runtime.image
agent_image_ref = os.environ.get("BOT_BOTTLE_IMAGE", image_default)
agent_image_ref = image_default
agent_provision = agent_provision_plan(
template=provider.template,
dockerfile=agent_dockerfile_path,