From 1c420008fbf578b6d9905713ebe0af31c3b64c0c Mon Sep 17 00:00:00 2001 From: Aquiles Viza Date: Sun, 8 Oct 2023 16:07:22 -0300 Subject: [PATCH] Added more flags to new_run script --- new_run.ps1 | 191 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 135 insertions(+), 56 deletions(-) diff --git a/new_run.ps1 b/new_run.ps1 index 2bed03c..ecc6820 100644 --- a/new_run.ps1 +++ b/new_run.ps1 @@ -1,68 +1,70 @@ param( [switch] $remote = $false, - [switch] $interactive = $false + [switch] $interactive = $false, + [switch] $silent = $false, + [switch] $clean = $false ) -$global:STACK_OPTIONS = [ordered]@{} +$global:STACK_OPTIONS = [ordered]@{ + 1 = 'analog-xk' + 2 = 'analog-xm' + 3 = 'analog-heavy' + 4 = 'digital-ator' + 5 = 'digital-icarus' + 6 = 'digital-heavy' + 7 = 'heavy' + 8 = "chipathon-tools" +} $global:SELECTED_STACK='chipathon-tools' -$global:CONTAINER_NAME='chipathon-tools' +$global:CONTAINER_NAME=$global:SELECTED_STACK $global:EXECMODE='desktop' +$global:PDK="gf180mcuC" $global:DIRECTORY=Get-Location | Foreach-Object { $_.Path } $global:PARAMS = "" -function validate-environment() { - Write-Host "Checking requirements and WSL updates" -ForegroundColor DarkGrayWrite-Host "" +New-Alias Call Invoke-Expression +function validate-environment() { + Write-Host "Checking requirements and WSL updates" -ForegroundColor DarkGray + Write-Host "" wsl --install Ubuntu --no-launch wsl --update Write-Host "" } -function select-image() { - Write-Host "Please select an image index:" - - $global:STACK_OPTIONS = [ordered]@{ - 1 = 'analog-xk' - 2 = 'analog-xm' - 3 = 'analog-heavy' - 4 = 'digital-ator' - 5 = 'digital-icarus' - 6 = 'digital-heavy' - 7 = 'heavy' - 8 = "chipathon-tools" - } +function select-stack() { + Write-Host "Please select an stack index:" $STACK_OPTIONS.GetEnumerator() | ForEach-Object { Write-Host "[$($_.Key)] - $($_.Value)" -ForegroundColor Cyan } - $response = Read-Host -Prompt "Container image to initialize [1-$($STACK_OPTIONS.Count)]" - $global:SELECTED_STACK = $STACK_OPTIONS[$response-1] + $response = Read-Host -Prompt "Container stack to initialize [1-$($STACK_OPTIONS.Count)]" + if ($response) { + $global:SELECTED_STACK = $STACK_OPTIONS[$response-1] + } - $global:CONTAINER_NAME = Read-Host -Prompt "Container instance name [default=$global:SELECTED_STACK]" - if (!$global:CONTAINER_NAME) { - $global:CONTAINER_NAME = $global:SELECTED_STACK + $response = Read-Host -Prompt "Container instance name [default=$global:CONTAINER_NAME]" + if ($response) { + $global:CONTAINER_NAME = $response } } - function select-execmode() { - $global:EXECMODE = $null - while(!$global:EXECMODE) { - Write-Host "Please select an execution mode index" - Write-Host '[1] - desktop' -ForegroundColor Cyan - Write-Host '[2] - web' -ForegroundColor Cyan - $response = Read-Host "Execution mode [1-2]" - if ($response -eq '1') { - $global:EXECMODE = 'desktop' - } elseif ($response -eq '2') { - $global:EXECMODE = 'web' - } else { - Write-Host "Unexpected respose, please try again" -ForegroundColor Red - } + Write-Host "Please select an execution mode index" + Write-Host '[1] - desktop' -ForegroundColor Cyan + Write-Host '[2] - web' -ForegroundColor Cyan + $response = Read-Host "Execution mode [1-2] [default=$global:EXECMODE]" + + if ($response -eq '1') { + $global:EXECMODE = 'desktop' + } elseif ($response -eq '2') { + $global:EXECMODE = 'web' + } else { + Write-Host "Using default mode ($global:EXECMODE)" } } @@ -83,47 +85,124 @@ function set-aditional-parameters() { } } -function run-docker() { - if($remote) { - $image = "--pull always git.1159.cl/mario1159/$SELECTED_STACK-$EXECMODE" - } else { - $image = "$SELECTED_STACK-$EXECMODE" +function force-pull() { + $response = Read-Host -Prompt "Do you want to pull latest image? [N/y] [default=N]" + + if ($response -eq 'y') { + $global:PARAMS += " --pull-always" } +} + +function select-pdk() { + Write-Host "Please select a pdk" + Write-Host '[1] - gf180mcuC' -ForegroundColor Cyan + Write-Host '[2] - sky130A' -ForegroundColor Cyan + $response = Read-Host "Execution mode [1-2] [default=$global:PDK]" + + if ($response -eq '1') { + $global:PDK = 'gf180mcuC' + } elseif ($response -eq '2') { + $global:PDK = 'sky130A' + } else { + Write-Host "Using default pdk ($global:PDK)" + } +} + +function attach-shell () { + Call "docker exec -it $global:CONTAINER_NAME bash" +} + +function run-docker-wsl() { + # if($remote) { + # #$image = "--pull always git.1159.cl/mario1159/$SELECTED_STACK-$EXECMODE" + # $image = "git.1159.cl/mario1159/$SELECTED_STACK-$EXECMODE" + # } else { + # $image = "$SELECTED_STACK-$EXECMODE" + # } + $image = "git.1159.cl/mario1159/$SELECTED_STACK-$EXECMODE" $global:PARAMS += " -d" $global:PARAMS += " --name $global:CONTAINER_NAME" $global:PARAMS += " -v /tmp/.X11-unix:/tmp/.X11-unix" $global:PARAMS += " -v /mnt/wslg:/mnt/wsl" + $global:PARAMS += " -e WAYLAND_DISPLAY=`$WAYLAND_DISPLAY" $global:PARAMS += " -e DISPLAY=`$DISPLAY" $global:PARAMS += " -e XDG_RUNTIME_DIR=/mnt/wslg" - $global:PARAMS += "-v ${global:DIRECTORY}:/home/designer/shared " + $global:PARAMS += " -v /mnt/${global:DIRECTORY}:/home/designer/shared " - wsl -d Ubuntu bash -ic "docker run ${PARAMS} ${image}" - #wsl -d Ubuntu bash -ic docker run -d --name chipathon-tools -v /tmp/.X11-unix:/tmp/.X11-unix -v /mnt/wslg:/mnt/wsl -e WAYLAND_DISPLAY=$WAYLAND_DISPLAY -e DISPLAY=$DISPLAY -e XDG_RUNTIME_DIR=/mnt/wslg chipathon-tools-desktop + #wsl -d Ubuntu bash -ic "docker run ${PARAMS} ${image}" + echo "docker run ${PARAMS} ${image}" if ($?) { Write-Host "Container created successfully!" -ForegroundColor Green Write-Host "Enter the container with `"docker exec -it $global:CONTAINER_NAME bash`"" -ForegroundColor DarkGray + + attach-shell + } else { + Write-Host "Container creation failed, see logs above" -ForegroundColor Red + } +} + +function run-docker-win() { + $image = "git.1159.cl/mario1159/$SELECTED_STACK-$EXECMODE" + + if ($clean) { + $global:PARAMS += "-it --rm" + $global:COMMAND = "bash" + } else { + $global:PARAMS += "-d" + $global:COMMAND = "" + } + $global:PARAMS += " --name $global:CONTAINER_NAME" + $global:PARAMS += " --security-opt seccomp=unconfined" + + # $global:PARAMS += " -p '8888:8888'" + + $global:PARAMS += " -v '\\wsl.localhost\Ubuntu\mnt\wslg:/tmp'" + $global:PARAMS += " -v ${global:DIRECTORY}:/home/designer/shared" + #$global:PARAMS += " -v '\\wsl.localhost\Ubuntu\mnt\wslg\runtime-dir'%XDG_RUNTIME_DIR%" + + #$global:PARAMS += " -e WAYLAND_DISPLAY=`$WAYLAND_DISPLAY" + $global:PARAMS += " -e PDK=$global:PDK" + $global:PARAMS += " -e DISPLAY=:0" + # $global:PARAMS += " -e XDG_RUNTIME_DIR=/mnt/wslg" + # SET PARAMS=%PARAMS% -e DISPLAY=%DISPLAY% + # SET PARAMS=%PARAMS% -e WAYLAND_DISPLAY=%WAYLAND_DISPLAY% + # SET PARAMS=%PARAMS% -e XDG_RUNTIME_DIR=%XDG_RUNTIME_DIR% + + + Call "docker run ${PARAMS} ${image} $global:COMMAND" + + if ($?) { + Write-Host "Container created successfully!" -ForegroundColor Green + Write-Host "Enter the container with `"docker exec -it $global:CONTAINER_NAME bash`"" -ForegroundColor DarkGray + + attach-shell } else { Write-Host "Container creation failed, see logs above" -ForegroundColor Red } } function run(){ - Write-Host "OSIC-Stacks Container Creation" -ForegroundColor Green - - # validate-environment - - if - ($interactive) { - select-image - select-execmod - bind-to-directory - set-aditional-parameters + if ($silent) { + Remove-Alias Call + New-Alias Call Write-Host } - run-docker + Write-Host "OSIC-Stacks Container Creation" -ForegroundColor Green + + validate-environment + + if ($interactive) { + select-stack + select-execmode + bind-to-directory + set-aditional-parameters + force-pull + } + + run-docker-win } run \ No newline at end of file