Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Dockerfile output - change ENV var syntax (#1004)

Mish Ushakove87576fb7cf8
diff --git a/.changeset/ninety-games-dress.md b/.changeset/ninety-games-dress.md
new file mode 100644
index 000000000..d4d3f56b0
--- /dev/null
+++ b/.changeset/ninety-games-dress.md
@@ -0,0 +1,6 @@
+---
+'@e2b/python-sdk': patch
+'e2b': patch
+---
+
+fix to_dockerfile env output syntax
diff --git a/packages/js-sdk/src/template/index.ts b/packages/js-sdk/src/template/index.ts
index a207f9441..ffb701bab 100644
--- a/packages/js-sdk/src/template/index.ts
+++ b/packages/js-sdk/src/template/index.ts
@@ -749,6 +749,14 @@ export class TemplateBase
dockerfile += `COPY ${instruction.args[0]} ${instruction.args[1]}\n`
continue
}
+ if (instruction.type === InstructionType.ENV) {
+ const values: string[] = []
+ for (let i = 0; i < instruction.args.length; i += 2) {
+ values.push(`${instruction.args[i]}=${instruction.args[i + 1]}`)
+ }
+ dockerfile += `ENV ${values.join(' ')}\n`
+ continue
+ }
dockerfile += `${instruction.type} ${instruction.args.join(' ')}\n`
}
if (this.startCmd) {
diff --git a/packages/js-sdk/tests/template/methods/toDockerfile.test.ts b/packages/js-sdk/tests/template/methods/toDockerfile.test.ts
index b1f734056..37f68bd96 100644
--- a/packages/js-sdk/tests/template/methods/toDockerfile.test.ts
+++ b/packages/js-sdk/tests/template/methods/toDockerfile.test.ts
@@ -30,3 +30,18 @@ RUN echo "Hello, World!"
`
expect(dockerfile).toBe(expectedDockerfile)
})
+
+test('toDockerfile with ENV instructions', { timeout: 180000 }, async () => {
+ const template = Template()
+ .fromUbuntuImage('24.04')
+ .setEnvs({ NODE_ENV: 'production', PORT: '8080' })
+ .setEnvs({ DEBUG: 'false' })
+
+ const dockerfile = Template.toDockerfile(template)
+
+ const expectedDockerfile = `FROM ubuntu:24.04
+ENV NODE_ENV=production PORT=8080
+ENV DEBUG=false
+`
+ expect(dockerfile).toBe(expectedDockerfile)
+})
diff --git a/packages/python-sdk/e2b/template/main.py b/packages/python-sdk/e2b/template/main.py
index 54a03c792..72bada15b 100644
--- a/packages/python-sdk/e2b/template/main.py
+++ b/packages/python-sdk/e2b/template/main.py
@@ -623,9 +623,9 @@ class TemplateBuilder:
def _set_start():
return self.set_start_cmd(
"sudo devcontainer up --workspace-folder "
- + devcontainer_directory
+ + str(devcontainer_directory)
+ " && sudo /prepare-exec.sh "
- + devcontainer_directory
+ + str(devcontainer_directory)
+ " | sudo tee /devcontainer.sh > /dev/null && sudo chmod +x /devcontainer.sh && sudo touch /devcontainer.up",
wait_for_file("/devcontainer.up"),
)
@@ -1246,6 +1246,14 @@ class TemplateBase:
)
continue
+ if instruction["type"] == InstructionType.ENV:
+ args = instruction["args"]
+ values = []
+ for i in range(0, len(args), 2):
+ values.append(f"{args[i]}={args[i + 1]}")
+ dockerfile += f"ENV {' '.join(values)}\n"
+ continue
+
dockerfile += (
f"{instruction['type'].value} {' '.join(instruction['args'])}\n"
)
diff --git a/packages/python-sdk/tests/async/template_async/methods/test_to_dockerfile.py b/packages/python-sdk/tests/async/template_async/methods/test_to_dockerfile.py
index 66fe69e1c..f955d1fbf 100644
--- a/packages/python-sdk/tests/async/template_async/methods/test_to_dockerfile.py
+++ b/packages/python-sdk/tests/async/template_async/methods/test_to_dockerfile.py
@@ -37,3 +37,21 @@ COPY README.md /app/README.md
RUN echo "Hello, World!"
"""
assert dockerfile == expected_dockerfile
+
+
+async def test_to_dockerfile_with_env_instructions():
+ template = (
+ AsyncTemplate()
+ .from_ubuntu_image("24.04")
+ .set_envs({"NODE_ENV": "production", "PORT": "8080"})
+ .set_envs({"DEBUG": "false"})
+ )
+
+ dockerfile = AsyncTemplate.to_dockerfile(template)
+
+ expected_dockerfile = """FROM ubuntu:24.04
+ENV NODE_ENV=production PORT=8080
+ENV DEBUG=false
+"""
+ assert dockerfile == expected_dockerfile
diff --git a/packages/python-sdk/tests/sync/template_sync/methods/test_to_dockerfile.py b/packages/python-sdk/tests/sync/template_sync/methods/test_to_dockerfile.py
index 37007a535..ed1b1499e 100644
--- a/packages/python-sdk/tests/sync/template_sync/methods/test_to_dockerfile.py
+++ b/packages/python-sdk/tests/sync/template_sync/methods/test_to_dockerfile.py
@@ -37,3 +37,21 @@ COPY README.md /app/README.md
RUN echo "Hello, World!"
"""
assert dockerfile == expected_dockerfile
+
+
+def test_to_dockerfile_with_env_instructions():
+ template = (
+ Template()
+ .from_ubuntu_image("24.04")
+ .set_envs({"NODE_ENV": "production", "PORT": "8080"})
+ .set_envs({"DEBUG": "false"})
+ )
+
+ dockerfile = Template.to_dockerfile(template)
+
+ expected_dockerfile = """FROM ubuntu:24.04
+ENV NODE_ENV=production PORT=8080
+ENV DEBUG=false
+"""
+ assert dockerfile == expected_dockerfile