Skip to content

Commit 86622ec

Browse files
committed
change dockerfile api call
1 parent 959793c commit 86622ec

3 files changed

Lines changed: 19 additions & 6 deletions

File tree

core/morph/config/project.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def dump_project_yaml(project: MorphProject) -> str:
170170
return f"""
171171
# Cloud Settings
172172
profile: {project.profile} # Defined in the Profile Section in `~/.morph/credentials`
173-
project_id: {project.project_id or ""}
173+
project_id: {project.project_id or "null"}
174174
175175
# Framework Settings
176176
default_connection: {project.default_connection}

core/morph/task/deploy.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,20 @@ def __init__(self, args: Flags):
5656
click.echo(click.style(f"Error: {self.dockerfile} not found", fg="red"))
5757
sys.exit(1)
5858
else:
59+
provider = "aws"
60+
if (
61+
self.project.deployment is not None
62+
and self.project.deployment.provider is not None
63+
):
64+
provider = self.project.deployment.provider or "aws"
5965
if self.project.build is None:
60-
dockerfile, dockerignore = get_dockerfile_from_api("morph", None, None)
66+
dockerfile, dockerignore = get_dockerfile_from_api(
67+
"morph", provider, None, None
68+
)
6169
else:
6270
dockerfile, dockerignore = get_dockerfile_from_api(
63-
self.project.build.framework,
71+
self.project.build.framework or "morph",
72+
provider,
6473
self.project.build.package_manager,
6574
self.project.build.runtime,
6675
)

core/morph/task/utils/load_dockerfile.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55

66
def get_dockerfile_from_api(
7-
framework: Optional[str] = "morph",
7+
framework: str,
8+
provider: str,
89
package_manager: Optional[str] = None,
910
runtime: Optional[str] = None,
1011
) -> Tuple[str, str]:
@@ -13,15 +14,18 @@ def get_dockerfile_from_api(
1314
1415
Args:
1516
framework: The framework to get the dockerfile for
17+
provider: The provider to get the dockerfile for
1618
package_manager: Optional package manager to use
17-
language_version: Optional language version to use
19+
runtime: Optional runtime to use
1820
1921
Returns:
2022
Tuple containing (dockerfile, dockerignore)
2123
"""
2224
url = f"https://backend-api-public.morph-cb9.workers.dev/dockerfile/{framework}"
2325

24-
params: Dict[str, Any] = {}
26+
params: Dict[str, Any] = {
27+
"provider": provider,
28+
}
2529
if package_manager:
2630
params["packageManager"] = package_manager
2731
if runtime:

0 commit comments

Comments
 (0)