From 3770d707051197e9f7c5fd66042a0c3ceef968f1 Mon Sep 17 00:00:00 2001 From: ljf Date: Sun, 11 Aug 2019 23:08:26 +0200 Subject: [PATCH] [enh] './ynh-dev start app' to get app dev env --- Vagrantfile | 1 + prebuild/Vagrantfile | 11 ++++++----- ynh-dev | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 8fef620..da18b9e 100755 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,6 +9,7 @@ NETWORK = "10.0.3." HOSTS = { "ynh-dev" => ["83", "ynh-dev"], "ynh-dev-buster" => ["84", "ynh-dev-buster"], + "app" => ["85", "ynh-dev-app"], } Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| diff --git a/prebuild/Vagrantfile b/prebuild/Vagrantfile index 86e45ec..30385a2 100644 --- a/prebuild/Vagrantfile +++ b/prebuild/Vagrantfile @@ -25,7 +25,7 @@ sudo apt-get -y --force-yes dist-upgrade # Install YunoHost wget https://raw.githubusercontent.com/YunoHost/install_script/stretch/install_yunohost -q -O /tmp/install_yunohost -sudo bash /tmp/install_yunohost -a -d unstable +sudo bash /tmp/install_yunohost -a -d $1 # Cleanup sudo apt-get clean -y @@ -34,21 +34,22 @@ SCRIPT NETWORK = "10.0.3." HOSTS = { - "ynh-dev" => ["83", "stretch64"], - "ynh-dev-buster" => ["84", "testing64"], + "ynh-dev" => ["83", "stretch64", "unstable"], + "ynh-dev-buster" => ["84", "testing64", "unstable"], + "ynh-dev-app" => ["85", "stretch64", "stable"], } Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| HOSTS.each do | (name, cfg) | - ipaddr, box = cfg + ipaddr, box, ynh_version = cfg config.vm.define name do |machine| machine.vm.box = "debian/" + box machine.vm.provision "shell" do |s| s.inline = $script - s.args = "" + s.args = [ynh_version] end machine.vm.provider "lxc" do |lxc| machine.vm.network :private_network, ip: NETWORK + ipaddr, lxc__bridge_name: 'lxcbr0' diff --git a/ynh-dev b/ynh-dev index 52e3938..a2d2760 100755 --- a/ynh-dev +++ b/ynh-dev @@ -165,7 +165,7 @@ function rebuild_ynhdev() { check_lxc_setup - local BOX="ynh-dev" + local BOX=${1:-ynh-dev} set -x cd prebuild @@ -184,7 +184,7 @@ function rebuild_ynhdev() # User message, and exit info "The Vagrant box was packaged to /tmp/$BOX.box" - info "You might want to run : vagrant box add 'yunohost/ynh-dev' /tmp/$BOX.box --force" + info "You might want to run : vagrant box add 'yunohost/$BOX' /tmp/$BOX.box --force" } function show_vm_ip()