diff --git a/bootstrap.sh b/bootstrap.sh index 85c34d6..cc16a3a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -101,7 +101,7 @@ fi ssh="ssh -F $SSH_CONFIG.root root" docker_port=${DOCKER_PORT:-2376} -ip_address=${IP_ADDRESS:-192.168.99.123} +ip_address=${__VM__IP_ADDRESS:-192.168.99.123} $ssh "touch ~/.hushlogin" if [ -z "$exists" ]; then @@ -210,6 +210,8 @@ EOSSH $ssh "rm ~/.hushlogin" echo --------------------- +mkdir -p ~/.ssh +touch ~/.ssh/config if [ -z "$(grep -w "Host $machine_name" ~/.ssh/config)" ]; then echo Adding ssh config for $machine_name cat $SSH_CONFIG.user >> ~/.ssh/config diff --git a/config/env_var.sh b/config/env_var.sh index cf62fcc..cbe224b 100644 --- a/config/env_var.sh +++ b/config/env_var.sh @@ -1 +1 @@ -export VERSION= +export VERSION=25.0.5 diff --git a/destroy.sh b/destroy.sh index 41496f2..f356225 100755 --- a/destroy.sh +++ b/destroy.sh @@ -13,14 +13,13 @@ vagrant destroy machine_name=${NAME:-linuxdev} -vagrant status +not_created=$(vagrant status | grep 'not created') -exitCode=$? -if [[ $exitCode != 0 ]];then +if [ -n "$not_created" ];then echo the VM is not exists any more, removing configs + rm -f status mkdir -p backup - mv ssh.config* backup/ + mv ssh.config* backup/ 2> /dev/null rm -rf ~/.docker/certs.$machine_name - exit $exitCode fi diff --git a/scripts/create_docker_certs.sh b/scripts/create_docker_certs.sh index 48bbe36..f8af0e8 100755 --- a/scripts/create_docker_certs.sh +++ b/scripts/create_docker_certs.sh @@ -8,7 +8,7 @@ fi # https://docs.docker.com/engine/security/protect-access/ -local_ip_addr=192.168.99.123 +local_ip_addr=${IP_ADDRESS:-192.168.99.123} common_name=$local_ip_addr passphrase=pass:passwd diff --git a/setup.ps1 b/setup.ps1 index e7c70dc..0f0b6d9 100644 --- a/setup.ps1 +++ b/setup.ps1 @@ -148,23 +148,6 @@ if ($installed_terminal_version -And $terminal_asset.name -match $installed_term } } -# Install vagrant manager -If ($withVagrantManager) { - Write-Host --------------------------------------- - $vmanager_location1="$env:ProgramFiles (x86)\Vagrant Manager\VagrantManager.exe" - $vmanager_location2="$env:LOCALAPPDATA\Programs\Vagrant Manager\VagrantManager.exe" - If ((Test-Path $vmanager_location1) -or (Test-Path $vmanager_location2)) { - Write-Host Vagrant Manager is already installed - } else { - Write-Host Installing Vagrant Manager - $vmanager_installer = download_github_release_installer -url "https://api.github.com/repos/lanayotech/vagrant-manager-windows/releases/latest" -pattern "*.exe" - $install_args = "/SP- /SILENT /NOCANCEL /NORESTART /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS" - Write-Host Installing $vmanager_installer, $install_args - Start-Process -FilePath $vmanager_installer -ArgumentList $install_args - Write-Host Installed Vagrant Manager. - } -} - ###################### # Install vscode If (-Not $noVsCode) { @@ -282,6 +265,23 @@ if ($installed_vbox_version -And $installed_vbox_version -match $vbox_installer_ } } +# Install vagrant manager +If ($withVagrantManager) { + Write-Host --------------------------------------- + $vmanager_location1="$env:ProgramFiles (x86)\Vagrant Manager\VagrantManager.exe" + $vmanager_location2="$env:LOCALAPPDATA\Programs\Vagrant Manager\VagrantManager.exe" + If ((Test-Path $vmanager_location1) -or (Test-Path $vmanager_location2)) { + Write-Host Vagrant Manager is already installed + } else { + Write-Host Installing Vagrant Manager + $vmanager_installer = download_github_release_installer -url "https://api.github.com/repos/lanayotech/vagrant-manager-windows/releases/latest" -pattern "*.exe" + $install_args = "/SP- /SILENT /NOCANCEL /NORESTART /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS" + Write-Host Installing $vmanager_installer, $install_args + Start-Process -FilePath $vmanager_installer -ArgumentList $install_args + Write-Host Installed Vagrant Manager. + } +} + ###################### # Install vagrant If (-Not $noVagrant) { @@ -290,7 +290,7 @@ Try { $installed_vagrant_version = vagrant --version | %{$_.split(' ')[1]} } catch {} #Write-Host Vagrant version: $installed_vagrant_version -$vagrant_url = "https://www.vagrantup.com/downloads" +$vagrant_url = "https://developer.hashicorp.com/vagrant/install" $vagrant_link = (Invoke-WebRequest -UseBasicParsing -Uri $vagrant_url).Links | Where-Object {$_.href -like "*64.msi"} $vagrant_installer_url = [System.Uri]$vagrant_link.href $vagrant_installer_filename = $vagrant_installer_url.Segments[-1] @@ -319,9 +319,11 @@ if ($installed_vagrant_version -And $installed_vagrant_version -match $vagrant_i } Write-Host ================================== -Write-Host Done. Please continue to bootstrap if ($virtualization_enabled -ne "Yes") { - Write-Host Virtualization is not enabled, please follow this link and try to enable - Write-Host https://www.smarthomebeginner.com/enable-hardware-virtualization-vt-x-amd-v/ + Write-Host Virtualization is not enabled, please use follow this link and try to disable Device Guard + Write-Host "https://github.com/kennyhyun/linuxdev/issues/71#issuecomment-2040021521" + exit -2 } + +Write-Host Done. Please continue to bootstrap