Skip to content

Commit

Permalink
ZXBOX 1.0.0 vagrant cloud box release
Browse files Browse the repository at this point in the history
  • Loading branch information
reefactor committed Sep 26, 2020
1 parent 2508b00 commit fff12e0
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 12 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/.idea
/.vagrant

/emul/usp

/.vagrant
/zxbox.box
19 changes: 17 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,28 @@

# ZX-SPECTRUM instant all-in pack

A currated collection of best emulators, roms and zx software.
A currated collection of best emulators and software.
All you need to [spend time](overboot.asm) on a [desert island](#play-offline).

Try [**jVGS**](https://reefactor.github.io/zx-spectrum-instapack/emul/jVGS/jvgs-offline.html)
#### Online

Try [**jVGS**](https://reefactor.github.io/zx-spectrum-instapack/emul/jVGS/jvgs-offline.html) ZX-Spectrum emulator
or [**Qaop** v1.4](https://reefactor.github.io/zx-spectrum-instapack/emul/QAOP/qaop.html#ay#128) online


#### ZXBOX VM
Download [ZXBOX](https://app.vagrantup.com/reefactor/boxes/ZXBOX) VM from vagrant cloud.
ZXBOX is [based on](build_zxbox.sh) Ubuntu20.04 + zx-spectrum instapack. You can [build your own version from sources](build_zxbox.sh)

##### ZXBOX VM structure
###### Nested emulation layers madness
| Emu layer #3 -- `ZX Spectrum` | USP, FUSE | Unreal Speccy | X128, r80, |
|---|---|---|---|
| Emu layer #2 -- `Crossplatform` | | [wine](https://www.winehq.org/) (Windows on Linux) | [dosbox](https://www.dosbox.com/) (MSDOS on Linux) |
| Emu layer #1 -- `Common VM OS` | | Ubuntu 20.04 Desktop | |
| HOST OS -- `VirtualBox` | | any [OS capable of running VirtualBox](https://www.virtualbox.org/manual/ch01.html#hostossupport) | |


### Best ZX-SPECTRUM emulators shortlist

|Host OS|Emulator| Source code |Last updated| Author |
Expand Down
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# vi: set ft=ruby :

# https://app.vagrantup.com/boxes/search
# "generic/ubuntu2004"
# "peru/ubuntu-20.04-desktop-amd64"
vmbox_image = ENV["VMBOX_IMAGE"] || "fasmat/ubuntu2004-desktop"


Expand All @@ -24,7 +22,7 @@ Vagrant.configure("2") do |config|

config.vm.box = vmbox_image

# enlarge your default disk size
# enlarge disk size
config.disksize.size = '16GB'

# allow ssh access from host with pubkey
Expand Down Expand Up @@ -69,6 +67,8 @@ Vagrant.configure("2") do |config|
config.vm.boot_timeout = 60
end

# config.vm.network "forwarded_port", guest: 80, host: 80

config.vm.define 'zxbox' do |vmbox|
vmbox.vm.hostname = "zxbox"
vmbox.vm.network "private_network", ip: "192.168.10.3"
Expand Down
9 changes: 3 additions & 6 deletions build_zxbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ scp -rp $SCRIPTDIR $TARGETHOST:~/instapack
set +e
ssh $TARGETHOST "sudo bash ~/instapack/install_zxbox_ubuntu2004.sh"

if [ -e $FROM_UBUNTUS_ERVER ]; then
sleep 30
# reboot again for autologin
ssh $TARGETHOST "sudo reboot"
set -e
fi

echo "ZXBOX VM build complete."
echo "Proceed with tuning and upload with vagrant_box_cloud_upload.sh"
19 changes: 19 additions & 0 deletions vagrant_box_cloud_upload.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/usr/bin/env bash
#
# Package ZXBOX into vagrant box for vagrant cloud upload
# https://app.vagrantup.com/reefactor/boxes/ZXBOX
#

set -xe
SCRIPTDIR=$(cd `dirname $0` && pwd)
pushd $SCRIPTDIR

vagrant halt
vagrant package --output zxbox.box
md5sum zxbox.box

# https://blog.ycshao.com/2017/09/16/how-to-upload-vagrant-box-to-vagrant-cloud/
# TODO automate upload script
# Creating Boxes with the API
# https://www.vagrantup.com/vagrant-cloud/boxes/create#creating-boxes-with-the-api
echo "Proceed with manual upload zxbox.box in https://app.vagrantup.com/reefactor/boxes/ZXBOX"

0 comments on commit fff12e0

Please sign in to comment.