Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: vagrant image install #341

Merged
merged 1 commit into from
Jul 21, 2023
Merged

fix: vagrant image install #341

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 8 additions & 32 deletions builder/Vagrantfile-ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,11 @@ VM_SOURCE = "/vagrant"
Vagrant.configure("2") do |config|
case ARCH
when "amd64"
config.vm.box = "generic/ubuntu2204"
config.vm.box = "ubuntu/jammy64"
when "arm64"
# unique 22.04 arm64 box available to date
# sha256sum c209ab013280d3cd26a344def60b7b19fbb427de904ea285057d94ca6ac82dd5
# - http://old-releases.ubuntu.com/releases/jammy/SHA256SUMS
# - http://old-releases.ubuntu.com/releases/jammy/ubuntu-22.04-live-server-arm64.iso
# - https://gitlab.com/jnh3/m1-baseboxes/-/blob/main/ubuntu/ubuntu-22.04-arm64.pkr.hcl#L11-16
config.vm.box = "jharoian3/ubuntu-22.04-arm64"
config.vm.box = "bento/ubuntu-22.04-arm64"
end

config.vm.hostname = VM_NAME
config.vm.synced_folder "./", "#{VM_SOURCE}"


case HOSTOS
when "Linux"
config.vm.provider "virtualbox" do |vb|
Expand All @@ -42,29 +34,13 @@ Vagrant.configure("2") do |config|
prl.name = VM_NAME
end
end

setup_ssh(config)

config.vm.provision :shell, inline: "echo INFO: Starting Provision"

config.vm.provision :shell, inline: "ARCH=#{ARCH} #{VM_SOURCE}/builder/prepare-ubuntu.sh"

config.vm.provision :shell, inline: "echo INFO: Provision finished, now connect via ssh"
end
config.vm.hostname = VM_NAME
config.vm.synced_folder "./", "#{VM_SOURCE}"

def setup_ssh(config)
config.ssh.extra_args = ["-t", "cd #{VM_SOURCE}; bash --login"]

# workaround for ubuntu 22.04 disabled ssh-rsa support
# - https://it-jog.com/khow/vag/vaguperror-ubuntu2204
if ARGV[0] == "up" then
config.ssh.insert_key = false
config.ssh.private_key_path = nil
config.ssh.username = "vagrant"
config.ssh.password = "vagrant"
end
config.vm.provision "shell", inline: <<-SHELL
sudo echo PubkeyAcceptedAlgorithms +ssh-rsa >> /etc/ssh/sshd_config
sudo sudo systemctl restart sshd
SHELL
config.vm.provision :shell, inline: "echo INFO: Starting Provision"
config.vm.provision :shell, inline: "ARCH=#{ARCH} #{VM_SOURCE}/builder/prepare-ubuntu.sh"
config.vm.provision :shell, inline: "echo INFO: Provision finished, now connect via ssh"
end