YunoHost/ynh-dev
1
0
Fork 0
mirror of https://github.com/YunoHost/ynh-dev.git synced 2024-09-03 20:05:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

Use an absolute path for lxc to avoid weird PATH issues

Browse source
This commit is contained in:
Alexandre Aubin 2019-10-08 22:36:53 +02:00
parent 5748513a49
commit 6a0a7d1990
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ynh-dev
View file

@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
lxc="sudo /snap/bin/lxc"
function show_usage() { function show_usage() {
cat <<EOF cat <<EOF
@ -128,12 +130,12 @@ function start_ynhdev()
local BOX=${1:-ynh-dev} local BOX=${1:-ynh-dev}
sudo lxc info $BOX &>/dev/null && critical "The container already exist. Use 'attach' to enter the LXC, or 'destroy' if you aim to recreate it." $lxc info $BOX &>/dev/null && critical "The container already exist. Use 'attach' to enter the LXC, or 'destroy' if you aim to recreate it."
sudo lxc image info $BOX-base &>/dev/null || critical "You should first build the base YunoHost LXC using ./ynh-dev rebuild" $lxc image info $BOX-base &>/dev/null || critical "You should first build the base YunoHost LXC using ./ynh-dev rebuild"
set -eu set -eu
set -x set -x
sudo lxc launch $BOX-base $BOX $lxc launch $BOX-base $BOX
sudo lxc config device add $BOX ynhdev-shared-folder disk path=/ynh-dev source="$PWD" $lxc config device add $BOX ynhdev-shared-folder disk path=/ynh-dev source="$PWD"
set +x set +x
attach_ynhdev $BOX attach_ynhdev $BOX
@ -143,16 +145,16 @@ function attach_ynhdev()
{ {
check_lxd_setup check_lxd_setup
local BOX=${1:-ynh-dev} local BOX=${1:-ynh-dev}
sudo lxc start $BOX 2>/dev/null || true $lxc start $BOX 2>/dev/null || true
sudo lxc exec $BOX -- /bin/bash $lxc exec $BOX -- /bin/bash
} }
function destroy_ynhdev() function destroy_ynhdev()
{ {
check_lxd_setup check_lxd_setup
local BOX=${1:-ynh-dev} local BOX=${1:-ynh-dev}
sudo lxc stop $BOX $lxc stop $BOX
sudo lxc delete $BOX $lxc delete $BOX
} }
function rebuild_ynhdev() function rebuild_ynhdev()
@ -162,14 +164,14 @@ function rebuild_ynhdev()
local BOX=${1:-ynh-dev} local BOX=${1:-ynh-dev}
set -x set -x
sudo lxc info $BOX-rebuild >/dev/null && sudo lxc delete $BOX-rebuild --force $lxc info $BOX-rebuild >/dev/null && $lxc delete $BOX-rebuild --force
sudo lxc launch images:debian/stretch/amd64 $BOX-rebuild $lxc launch images:debian/stretch/amd64 $BOX-rebuild
sudo lxc config set $BOX-rebuild security.privileged true $lxc config set $BOX-rebuild security.privileged true
sudo lxc restart $BOX-rebuild $lxc restart $BOX-rebuild
sudo lxc exec $BOX-rebuild -- apt install curl -y $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" $lxc exec $BOX-rebuild -- /bin/bash -c "curl https://install.yunohost.org | bash -s -- -a -d unstable"
sudo lxc stop $BOX-rebuild $lxc stop $BOX-rebuild
sudo lxc publish $BOX-rebuild --alias $BOX-base $lxc publish $BOX-rebuild --alias $BOX-base
set +x set +x
} }