Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Renames agenta app Dockerfiles to non-trivial names #1739

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions agenta-backend/agenta_backend/services/container_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,13 @@ def build_image_job(

try:
if isCloudProd():
dockerfile = "Dockerfile.cloud"
dockerfile = "Dockerfile.cloud.agenta"
if not Path(dockerfile).exists():
dockerfile = "Dockerfile.cloud" # For backward compatibility
else:
dockerfile = "Dockerfile"
dockerfile = "Dockerfile.oss.agenta"
if not Path(dockerfile).exists():
dockerfile = "Dockerfile" # For backward compatibility
image, build_log = client.images.build(
path=str(temp_dir),
tag=image_name,
Expand Down
6 changes: 3 additions & 3 deletions agenta-cli/agenta/docker/docker_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ def create_dockerfile(out_folder: Path) -> Path:
"""
assert Path(out_folder).exists(), f"Folder {out_folder} does not exist."
dockerfile_template = (
Path(__file__).parent / "docker-assets" / "Dockerfile.template"
Path(__file__).parent / "docker-assets" / "Dockerfile.oss.template"
)
dockerfile_path = out_folder / "Dockerfile"
dockerfile_path = out_folder / "Dockerfile.oss.agenta"
shutil.copy(dockerfile_template, dockerfile_path)
dockerfile_template = (
Path(__file__).parent / "docker-assets" / "Dockerfile.cloud.template"
)
dockerfile_path = out_folder / "Dockerfile.cloud"
dockerfile_path = out_folder / "Dockerfile.cloud.agenta"
shutil.copy(dockerfile_template, dockerfile_path)

return dockerfile_path
Expand Down
Loading