From 46c8e95604cd20aa01b9a6aa9e22ff8cacef301f Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 19 Dec 2019 20:32:44 +0800 Subject: [PATCH] add buster support --- ynh-dev | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/ynh-dev b/ynh-dev index e0e01b8..651da12 100755 --- a/ynh-dev +++ b/ynh-dev @@ -6,10 +6,10 @@ function show_usage() { ${BLUE}On the host, to manage the LXC${NORMAL} ${BLUE}==============================${NORMAL} - start [NAME] (Create and) starts a LXC (ynh-dev by default) - attach [NAME] Attach an already started LXC (ynh-dev by default) - destroy [NAME] Destroy the ynh-dev LXC (ynh-dev by default) - rebuild Rebuild a fresh, up-to-date box + start [NAME] [DEBIAN_VERSION] (Create and) starts a LXC (ynh-dev by default) + attach [NAME] [DEBIAN_VERSION] Attach an already started LXC (ynh-dev by default) + destroy [NAME] [DEBIAN_VERSION] Destroy the ynh-dev LXC (ynh-dev by default) + rebuild [NAME] [DEBIAN_VERSION] Rebuild a fresh, up-to-date box ${BLUE}Inside the dev instance${NORMAL} ${BLUE}=======================${NORMAL} @@ -133,22 +133,23 @@ function start_ynhdev() check_lxd_setup local BOX=${1:-ynh-dev} + local DEBIAN_VERSION=${2:-stretch} - if ! sudo lxc info $BOX &>/dev/null + if ! sudo lxc info $BOX-$DEBIAN_VERSION &>/dev/null then - sudo lxc image info $BOX-base &>/dev/null || critical "You should first build the base YunoHost LXC using ./ynh-dev rebuild" + sudo lxc image info $BOX-$DEBIAN_VERSION-base &>/dev/null || critical "You should first build the base YunoHost LXC using ./ynh-dev rebuild" set -eu set -x - sudo lxc launch $BOX-base $BOX - sudo lxc config set $BOX security.privileged true - sudo lxc config device add $BOX ynhdev-shared-folder disk path=/ynh-dev source="$PWD" + sudo lxc launch $BOX-$DEBIAN_VERSION-base $BOX-$DEBIAN_VERSION + sudo lxc config set $BOX-$DEBIAN_VERSION security.privileged true + sudo lxc config device add $BOX-$DEBIAN_VERSION ynhdev-shared-folder disk path=/ynh-dev source="$PWD" set +x info "Now attaching to the container" else info "Attaching to existing container" fi - attach_ynhdev $BOX + attach_ynhdev $BOX $DEBIAN_VERSION } function attach_ynhdev() @@ -167,16 +168,20 @@ function attach_ynhdev() check_lxd_setup local BOX=${1:-ynh-dev} - sudo lxc start $BOX 2>/dev/null || true - sudo lxc exec $BOX --cwd /ynh-dev -- /bin/bash + local DEBIAN_VERSION=${2:-stretch} + + sudo lxc start $BOX-$DEBIAN_VERSION 2>/dev/null || true + sudo lxc exec $BOX-$DEBIAN_VERSION --cwd /ynh-dev -- /bin/bash } function destroy_ynhdev() { check_lxd_setup local BOX=${1:-ynh-dev} - sudo lxc stop $BOX - sudo lxc delete $BOX + local DEBIAN_VERSION=${2:-stretch} + + sudo lxc stop $BOX-$DEBIAN_VERSION + sudo lxc delete $BOX-$DEBIAN_VERSION } function rebuild_ynhdev() @@ -184,16 +189,17 @@ function rebuild_ynhdev() check_lxd_setup local BOX=${1:-ynh-dev} + local DEBIAN_VERSION=${2:-stretch} set -x - sudo lxc info $BOX-rebuild >/dev/null && sudo lxc delete $BOX-rebuild --force - sudo lxc launch images:debian/stretch/amd64 $BOX-rebuild - sudo lxc config set $BOX-rebuild security.privileged true - sudo lxc restart $BOX-rebuild - sudo lxc exec $BOX-rebuild -- apt install curl -y - sudo lxc exec $BOX-rebuild -- /bin/bash -c "curl https://install.yunohost.org | bash -s -- -a -d unstable" - sudo lxc stop $BOX-rebuild - sudo lxc publish $BOX-rebuild --alias $BOX-base + sudo lxc info $BOX-$DEBIAN_VERSION-rebuild >/dev/null && sudo lxc delete $BOX-$DEBIAN_VERSION-rebuild --force + sudo lxc launch images:debian/$DEBIAN_VERSION/amd64 $BOX-$DEBIAN_VERSION-rebuild + sudo lxc config set $BOX-$DEBIAN_VERSION-rebuild security.privileged true + sudo lxc restart $BOX-$DEBIAN_VERSION-rebuild + sudo lxc exec $BOX-$DEBIAN_VERSION-rebuild -- apt install curl -y + sudo lxc exec $BOX-$DEBIAN_VERSION-rebuild -- /bin/bash -c "curl https://install.yunohost.org | bash -s -- -a -d unstable" + sudo lxc stop $BOX-$DEBIAN_VERSION-rebuild + sudo lxc publish $BOX-$DEBIAN_VERSION-rebuild --alias $BOX-$DEBIAN_VERSION-base set +x }