Merge branch 'development' into development_heropods
This commit is contained in:
@@ -2,7 +2,7 @@ module heropods
|
||||
|
||||
import incubaid.herolib.osal.core as osal
|
||||
import incubaid.herolib.virt.crun
|
||||
import incubaid.herolib.installers.virt.herorunner as herorunner_installer
|
||||
import incubaid.herolib.installers.virt.crun_installer
|
||||
import os
|
||||
|
||||
// ContainerImageType defines the available container base images
|
||||
@@ -92,8 +92,8 @@ pub fn (mut self HeroPods) container_new(args ContainerNewArgs) !&Container {
|
||||
|
||||
// Ensure crun is installed on host
|
||||
if !osal.cmd_exists('crun') {
|
||||
mut herorunner := herorunner_installer.new()!
|
||||
herorunner.install()!
|
||||
mut crun_inst := crun_installer.get()!
|
||||
crun_inst.install(reset: false)!
|
||||
}
|
||||
|
||||
// Create container struct but don't create the actual container in crun yet
|
||||
|
||||
@@ -3,6 +3,7 @@ module herorun2
|
||||
import incubaid.herolib.osal.tmux
|
||||
import incubaid.herolib.osal.sshagent
|
||||
import incubaid.herolib.osal.core as osal
|
||||
import incubaid.herolib.core.texttools
|
||||
import time
|
||||
import os
|
||||
|
||||
@@ -49,9 +50,6 @@ pub fn new_executor(args ExecutorArgs) !Executor {
|
||||
// Initialize tmux properly
|
||||
mut t := tmux.new(sessionid: args.container_id)!
|
||||
|
||||
// Initialize Hetzner manager properly
|
||||
mut hetzner := hetznermanager.get() or { hetznermanager.new()! }
|
||||
|
||||
return Executor{
|
||||
node: node
|
||||
container_id: args.container_id
|
||||
@@ -61,7 +59,6 @@ pub fn new_executor(args ExecutorArgs) !Executor {
|
||||
session_name: args.container_id
|
||||
window_name: 'main'
|
||||
agent: agent
|
||||
hetzner: hetzner
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user