feat: set default user and workdir when using Dockerfile

.changeset/four-dryers-beg.md

@@ -0,0 +1,5 @@
+---
+'@e2b/cli': patch
+---
+
+fix template migration and init python relative import

.changeset/lovely-insects-dress.md

@@ -0,0 +1,7 @@
+---
+'@e2b/python-sdk': patch
+'e2b': patch
+'@e2b/cli': patch
+---
+
+set default user and workdir when Dockerfile source is used in template

.changeset/pink-hotels-hunt.md

@@ -0,0 +1,5 @@
+---
+'@e2b/cli': patch
+---
+
+support template migration without toml config

packages/cli/src/commands/template/migrate.ts

@@ -124,18 +124,22 @@ export const migrateCommand = new commander.Command('migrate')
         const root = getRoot(opts.path)
         const configPath = getConfigPath(root, opts.config)
 
+        let config: E2BConfig = {
+          template_id: 'name-your-template',
+          dockerfile: defaultDockerfileName,
+        }
+
         // Validate config file exists
-        if (!fs.existsSync(configPath)) {
+        if (fs.existsSync(configPath)) {
+          config = await loadConfig(configPath)
+        } else {
           console.error(
             `Config file ${asLocalRelative(
               path.relative(root, configPath)
-            )} not found. Please ensure the config file exists.`
+            )} not found. Using defaults.`
           )
-          process.exit(1)
         }
 
-        const config = await loadConfig(configPath)
-
         // Determine Dockerfile path
         const dockerfilePath =
           opts.dockerfile || config.dockerfile || defaultDockerfileName

packages/cli/src/templates/python-build-async.hbs

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/src/templates/python-build-sync.hbs

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/src/templates/python-template.hbs

@@ -28,13 +28,9 @@ template = (
 {{/each}}
 {{#if startCmd}}
 {{#if readyCmd}}
-    .set_user("root")
-    .set_workdir("/home/user")
-    .set_start_cmd("{{{escapeDoubleQuotes startCmd}}}", "{{{escapeDoubleQuotes readyCmd}}}")
+    .set_start_cmd("sudo {{{escapeDoubleQuotes startCmd}}}", "{{{escapeDoubleQuotes readyCmd}}}")
 {{/if}}
 {{else if readyCmd}}
-    .set_user("root")
-    .set_workdir("/home/user")
-    .set_ready_cmd("{{{escapeDoubleQuotes readyCmd}}}")
+    .set_ready_cmd("sudo {{{escapeDoubleQuotes readyCmd}}}")
 {{/if}}
 )

packages/cli/src/templates/typescript-template.hbs

@@ -27,12 +27,8 @@ export const template = Template()
 {{/each}}
 {{#if startCmd}}
 {{#if readyCmd}}
-  .setUser('root')
-  .setWorkdir('/home/user')
-  .setStartCmd('{{{escapeQuotes startCmd}}}', '{{{escapeQuotes readyCmd}}}')
+  .setStartCmd('sudo {{{escapeQuotes startCmd}}}', '{{{escapeQuotes readyCmd}}}')
 {{/if}}
 {{else if readyCmd}}
-  .setUser('root')
-  .setWorkdir('/home/user')
-  .setReadyCmd('{{{escapeQuotes readyCmd}}}')
+  .setReadyCmd('sudo {{{escapeQuotes readyCmd}}}')
 {{/if}}

packages/cli/tests/commands/template/fixtures/complex-python/expected/python-async/build_dev.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/complex-python/expected/python-async/build_prod.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/complex-python/expected/python-async/template.py

@@ -16,7 +16,7 @@
     .run_cmd("pip install --upgrade pip && pip install -r requirements.txt")
     .copy("app.py", ".")
     .set_user("appuser")
-    .set_user("root")
+    .set_user("user")
     .set_workdir("/home/user")
-    .set_start_cmd("gunicorn --bind 0.0.0.0:8000 app:application", "sleep 20")
+    .set_start_cmd("sudo gunicorn --bind 0.0.0.0:8000 app:application", "sleep 20")
 )

packages/cli/tests/commands/template/fixtures/complex-python/expected/python-sync/build_dev.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/complex-python/expected/python-sync/build_prod.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/complex-python/expected/python-sync/template.py

@@ -16,7 +16,7 @@
     .run_cmd("pip install --upgrade pip && pip install -r requirements.txt")
     .copy("app.py", ".")
     .set_user("appuser")
-    .set_user("root")
+    .set_user("user")
     .set_workdir("/home/user")
-    .set_start_cmd("gunicorn --bind 0.0.0.0:8000 app:application", "sleep 20")
+    .set_start_cmd("sudo gunicorn --bind 0.0.0.0:8000 app:application", "sleep 20")
 )

packages/cli/tests/commands/template/fixtures/complex-python/expected/typescript/template.ts

@@ -15,6 +15,6 @@ export const template = Template()
   .runCmd('pip install --upgrade pip && pip install -r requirements.txt')
   .copy('app.py', '.')
   .setUser('appuser')
-  .setUser('root')
+  .setUser('user')
   .setWorkdir('/home/user')
-  .setStartCmd('gunicorn --bind 0.0.0.0:8000 app:application', 'sleep 20')
+  .setStartCmd('sudo gunicorn --bind 0.0.0.0:8000 app:application', 'sleep 20')

packages/cli/tests/commands/template/fixtures/copy-variations/expected/python-async/build_dev.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/copy-variations/expected/python-async/build_prod.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/copy-variations/expected/python-async/template.py

@@ -8,4 +8,6 @@
     .copy("package.json", "/app/")
     .copy("src/index.js", "./src/")
     .copy("config.json", "/etc/app/config.json")
+    .set_user("user")
+    .set_workdir("/home/user")
 )

packages/cli/tests/commands/template/fixtures/copy-variations/expected/python-sync/build_dev.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/copy-variations/expected/python-sync/build_prod.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/copy-variations/expected/python-sync/template.py

@@ -8,4 +8,6 @@
     .copy("package.json", "/app/")
     .copy("src/index.js", "./src/")
     .copy("config.json", "/etc/app/config.json")
+    .set_user("user")
+    .set_workdir("/home/user")
 )

packages/cli/tests/commands/template/fixtures/copy-variations/expected/typescript/template.ts

@@ -6,4 +6,6 @@ export const template = Template()
   .setWorkdir('/')
   .copy('package.json', '/app/')
   .copy('src/index.js', './src/')
-  .copy('config.json', '/etc/app/config.json')
+  .copy('config.json', '/etc/app/config.json')
+  .setUser('user')
+  .setWorkdir('/home/user')

packages/cli/tests/commands/template/fixtures/custom-commands/expected/python-async/build_dev.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/custom-commands/expected/python-async/build_prod.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/custom-commands/expected/python-async/template.py

@@ -7,7 +7,7 @@
     .set_workdir("/")
     .set_workdir("/app")
     .copy("server.js", ".")
-    .set_user("root")
+    .set_user("user")
     .set_workdir("/home/user")
-    .set_start_cmd("node server.js", "curl -f http://localhost:3000/health || exit 1")
+    .set_start_cmd("sudo node server.js", "curl -f http://localhost:3000/health || exit 1")
 )

packages/cli/tests/commands/template/fixtures/custom-commands/expected/python-sync/build_dev.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/custom-commands/expected/python-sync/build_prod.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/custom-commands/expected/python-sync/template.py

@@ -7,7 +7,7 @@
     .set_workdir("/")
     .set_workdir("/app")
     .copy("server.js", ".")
-    .set_user("root")
+    .set_user("user")
     .set_workdir("/home/user")
-    .set_start_cmd("node server.js", "curl -f http://localhost:3000/health || exit 1")
+    .set_start_cmd("sudo node server.js", "curl -f http://localhost:3000/health || exit 1")
 )

packages/cli/tests/commands/template/fixtures/custom-commands/expected/typescript/template.ts

@@ -6,6 +6,6 @@ export const template = Template()
   .setWorkdir('/')
   .setWorkdir('/app')
   .copy('server.js', '.')
-  .setUser('root')
+  .setUser('user')
   .setWorkdir('/home/user')
-  .setStartCmd('node server.js', 'curl -f http://localhost:3000/health || exit 1')
+  .setStartCmd('sudo node server.js', 'curl -f http://localhost:3000/health || exit 1')

packages/cli/tests/commands/template/fixtures/minimal-dockerfile/expected/python-async/build_dev.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/minimal-dockerfile/expected/python-async/build_prod.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/minimal-dockerfile/expected/python-async/template.py

@@ -5,4 +5,6 @@
     .from_image("ubuntu:latest")
     .set_user("root")
     .set_workdir("/")
+    .set_user("user")
+    .set_workdir("/home/user")
 )

packages/cli/tests/commands/template/fixtures/minimal-dockerfile/expected/python-sync/build_dev.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/minimal-dockerfile/expected/python-sync/build_prod.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/minimal-dockerfile/expected/python-sync/template.py

@@ -5,4 +5,6 @@
     .from_image("ubuntu:latest")
     .set_user("root")
     .set_workdir("/")
+    .set_user("user")
+    .set_workdir("/home/user")
 )

packages/cli/tests/commands/template/fixtures/minimal-dockerfile/expected/typescript/template.ts

@@ -3,4 +3,6 @@ import { Template } from 'e2b'
 export const template = Template()
   .fromImage('ubuntu:latest')
   .setUser('root')
-  .setWorkdir('/')
+  .setWorkdir('/')
+  .setUser('user')
+  .setWorkdir('/home/user')

packages/cli/tests/commands/template/fixtures/multi-stage/expected/python-async/build_dev.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/multi-stage/expected/python-async/build_prod.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/multi-stage/expected/python-sync/build_dev.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/multi-stage/expected/python-sync/build_prod.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/multiple-env/expected/python-async/build_dev.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/multiple-env/expected/python-async/build_prod.py

@@ -1,6 +1,6 @@
 import asyncio
 from e2b import AsyncTemplate, default_build_logger
-from template import template
+from .template import template
 
 
 async def main():

packages/cli/tests/commands/template/fixtures/multiple-env/expected/python-async/template.py

@@ -20,4 +20,6 @@
         "SINGLE_VAR": "single_value",
     })
     .set_workdir("/app")
+    .set_user("user")
+    .set_workdir("/home/user")
 )

packages/cli/tests/commands/template/fixtures/multiple-env/expected/python-sync/build_dev.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":

packages/cli/tests/commands/template/fixtures/multiple-env/expected/python-sync/build_prod.py

@@ -1,5 +1,5 @@
 from e2b import Template, default_build_logger
-from template import template
+from .template import template
 
 
 if __name__ == "__main__":