Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix .toDocker RUN and COPY handling (#972)
Mish Ushakovc47927f1d0f2
diff --git a/.changeset/wise-pandas-compete.md b/.changeset/wise-pandas-compete.mdnew file mode 100644index 000000000..cda719bde--- /dev/null+++ b/.changeset/wise-pandas-compete.md@@ -0,0 +1,6 @@+---+'@e2b/python-sdk': patch+'e2b': patch+---++fix RUN and COPY handling in to_dockerfilediff --git a/packages/js-sdk/src/template/index.ts b/packages/js-sdk/src/template/index.tsindex 14f711812..86ec7d480 100644--- a/packages/js-sdk/src/template/index.ts+++ b/packages/js-sdk/src/template/index.ts@@ -636,6 +636,14 @@ export class TemplateBaselet dockerfile = `FROM ${this.baseImage}\n`for (const instruction of this.instructions) {+ if (instruction.type === InstructionType.RUN) {+ dockerfile += `RUN ${instruction.args[0]}\n`+ continue+ }+ if (instruction.type === InstructionType.COPY) {+ dockerfile += `COPY ${instruction.args[0]} ${instruction.args[1]}\n`+ continue+ }dockerfile += `${instruction.type} ${instruction.args.join(' ')}\n`}if (this.startCmd) {diff --git a/packages/js-sdk/tests/template/methods/pipInstall.test.ts b/packages/js-sdk/tests/template/methods/pipInstall.test.tsindex c3e8fc34f..a9dd7f30f 100644--- a/packages/js-sdk/tests/template/methods/pipInstall.test.ts+++ b/packages/js-sdk/tests/template/methods/pipInstall.test.ts@@ -11,3 +11,13 @@ test('pip install', { timeout: 180000 }, async () => {alias: randomUUID(),})})++test('pip install global', { timeout: 180000 }, async () => {+ const template = Template()+ .fromPythonImage('3.13.7-trixie')+ .pipInstall(['six', 'pyyaml'], { g: true })++ await Template.build(template, {+ alias: randomUUID(),+ })+})diff --git a/packages/js-sdk/tests/template/methods/toDockerfile.test.ts b/packages/js-sdk/tests/template/methods/toDockerfile.test.tsnew file mode 100644index 000000000..b1f734056--- /dev/null+++ b/packages/js-sdk/tests/template/methods/toDockerfile.test.ts@@ -0,0 +1,32 @@+import { expect, test } from 'vitest'+import { Template } from '../../../src'++test('toDockerfile', { timeout: 180000 }, async () => {+ const template = Template()+ .fromUbuntuImage('24.04')+ .copy('README.md', '/app/README.md')+ .runCmd('echo "Hello, World!"')++ const dockerfile = Template.toDockerfile(template)++ const expectedDockerfile = `FROM ubuntu:24.04+COPY README.md /app/README.md+RUN echo "Hello, World!"+`+ expect(dockerfile).toBe(expectedDockerfile)+})++test('toDockerfile with options', { timeout: 180000 }, async () => {+ const template = Template()+ .fromUbuntuImage('24.04')+ .copy('README.md', '/app/README.md', { user: 'root' })+ .runCmd('echo "Hello, World!"', { user: 'root' })++ const dockerfile = Template.toDockerfile(template)++ const expectedDockerfile = `FROM ubuntu:24.04+COPY README.md /app/README.md+RUN echo "Hello, World!"+`+ expect(dockerfile).toBe(expectedDockerfile)+})diff --git a/packages/python-sdk/e2b/template/main.py b/packages/python-sdk/e2b/template/main.pyindex 5129c3ebc..e7a982e03 100644--- a/packages/python-sdk/e2b/template/main.py+++ b/packages/python-sdk/e2b/template/main.py@@ -1025,6 +1025,16 @@ class TemplateBase:dockerfile = f"FROM {template._template._base_image}\n"for instruction in template._template._instructions:+ if instruction["type"] == InstructionType.RUN:+ dockerfile += f"RUN {instruction['args'][0]}\n"+ continue++ if instruction["type"] == InstructionType.COPY:+ dockerfile += (+ f"COPY {instruction['args'][0]} {instruction['args'][1]}\n"+ )+ continue+dockerfile += (f"{instruction['type'].value} {' '.join(instruction['args'])}\n")diff --git a/packages/python-sdk/tests/async/template_async/methods/test_pip_install.py b/packages/python-sdk/tests/async/template_async/methods/test_pip_install.pyindex a9d647c6a..392031bad 100644--- a/packages/python-sdk/tests/async/template_async/methods/test_pip_install.py+++ b/packages/python-sdk/tests/async/template_async/methods/test_pip_install.py@@ -16,3 +16,17 @@ async def test_pip_install():template,alias=str(uuid4()),)++[email protected]_debug()+async def test_pip_install_global():+ template = (+ AsyncTemplate()+ .from_python_image("3.13.7-trixie")+ .pip_install(["six", "pyyaml"], g=True)+ )++ await AsyncTemplate.build(+ template,+ alias=str(uuid4()),+ )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.pynew file mode 100644index 000000000..66fe69e1c--- /dev/null+++ b/packages/python-sdk/tests/async/template_async/methods/test_to_dockerfile.py@@ -0,0 +1,39 @@+import pytest++from e2b import AsyncTemplate++[email protected]_debug()+async def test_to_dockerfile():+ template = (+ AsyncTemplate()+ .from_ubuntu_image("24.04")+ .copy("README.md", "/app/README.md")+ .run_cmd('echo "Hello, World!"')+ )++ dockerfile = AsyncTemplate.to_dockerfile(template)++ expected_dockerfile = """FROM ubuntu:24.04+COPY README.md /app/README.md+RUN echo "Hello, World!"+"""+ assert dockerfile == expected_dockerfile++[email protected]_debug()+async def test_to_dockerfile_with_options():+ template = (+ AsyncTemplate()+ .from_ubuntu_image("24.04")+ .copy("README.md", "/app/README.md", user="root")+ .run_cmd('echo "Hello, World!"', user="root")+ )++ dockerfile = AsyncTemplate.to_dockerfile(template)++ expected_dockerfile = """FROM ubuntu:24.04+COPY README.md /app/README.md+RUN echo "Hello, World!"+"""+ assert dockerfile == expected_dockerfilediff --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.pynew file mode 100644index 000000000..37007a535--- /dev/null+++ b/packages/python-sdk/tests/sync/template_sync/methods/test_to_dockerfile.py@@ -0,0 +1,39 @@+import pytest++from e2b import Template++[email protected]_debug()+def test_to_dockerfile():+ template = (+ Template()+ .from_ubuntu_image("24.04")+ .copy("README.md", "/app/README.md")+ .run_cmd('echo "Hello, World!"')+ )++ dockerfile = Template.to_dockerfile(template)++ expected_dockerfile = """FROM ubuntu:24.04+COPY README.md /app/README.md+RUN echo "Hello, World!"+"""+ assert dockerfile == expected_dockerfile++[email protected]_debug()+def test_to_dockerfile_with_options():+ template = (+ Template()+ .from_ubuntu_image("24.04")+ .copy("README.md", "/app/README.md", user="root")+ .run_cmd('echo "Hello, World!"', user="root")+ )++ dockerfile = Template.to_dockerfile(template)++ expected_dockerfile = """FROM ubuntu:24.04+COPY README.md /app/README.md+RUN echo "Hello, World!"+"""+ assert dockerfile == expected_dockerfile