From 5e39c657936d099a74cea9e5d0f4099d52003c4e Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 4 Sep 2018 16:37:34 +0200 Subject: [PATCH 1/8] Point to yunohost repo so that's more relevant for the PR --- README.md | 4 ++-- deploy.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 7a98aee..c67e6cb 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ If you run Archlinux, this page should be quite useful to setup LXC : https://gi Then, go into your favorite development folder and deploy ynh-dev with : ```bash -curl https://raw.githubusercontent.com/alexAubin/ynh-dev/master/deploy.sh | bash +curl https://raw.githubusercontent.com/yunohost/ynh-dev/master/deploy.sh | bash ``` This will create a new `ynh-dev` folder with everything you need inside. In particular, you shall notice that there are clones or the various git repositories. In the next step, we shall start a LXC and 'link' those folders between the host and the LXC. @@ -129,7 +129,7 @@ Deploy a `ynh-dev` folder at the root of the filesystem with : ``` cd / -curl https://raw.githubusercontent.com/alexAubin/ynh-dev/master/deploy.sh | bash +curl https://raw.githubusercontent.com/yunohost/ynh-dev/master/deploy.sh | bash cd /ynh-dev ``` diff --git a/deploy.sh b/deploy.sh index eefb283..546fbb6 100755 --- a/deploy.sh +++ b/deploy.sh @@ -2,7 +2,7 @@ set -x -git clone https://github.com/alexAubin/ynh-dev +git clone https://github.com/yunohost/ynh-dev cd ./ynh-dev git clone https://github.com/YunoHost/moulinette git clone https://github.com/YunoHost/yunohost From 220baef21d4a96e79b53f8047c9595f4aecddecb Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 4 Sep 2018 17:01:54 +0200 Subject: [PATCH 2/8] rm old file --- .../.vagrant/machines/stretch-unstable/virtualbox/vagrant_cwd | 1 - 1 file changed, 1 deletion(-) delete mode 100644 prebuild/.vagrant/machines/stretch-unstable/virtualbox/vagrant_cwd diff --git a/prebuild/.vagrant/machines/stretch-unstable/virtualbox/vagrant_cwd b/prebuild/.vagrant/machines/stretch-unstable/virtualbox/vagrant_cwd deleted file mode 100644 index 8ea7d2b..0000000 --- a/prebuild/.vagrant/machines/stretch-unstable/virtualbox/vagrant_cwd +++ /dev/null @@ -1 +0,0 @@ -/home/alex/dev/ynh-dev/VagrantFile/prebuild \ No newline at end of file From cafa686a27c738e1dc4c33db25acfd38293c416a Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 4 Sep 2018 17:03:23 +0200 Subject: [PATCH 3/8] Outdated README is outdated --- prebuild/README.md | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 prebuild/README.md diff --git a/prebuild/README.md b/prebuild/README.md deleted file mode 100644 index 39eca9d..0000000 --- a/prebuild/README.md +++ /dev/null @@ -1,38 +0,0 @@ -# Build your own YunoHost Vagrant box - -## Get Debian base boxes - -```bash -vagrant box add debian/stretch64 -``` - -## Build YunoHost boxes - -Download the vagrant file to build from debian boxes - -```bash -wget https://raw.githubusercontent.com/YunoHost/Vagrantfile/master/prebuild/Vagrantfile -``` - -## Run your homemade boxes - -Run the box you need by calling `vagrant up DEBIAN_CODENAME-YUNOHOST_VERSION` - -```bash -vagrant up stretch-unstable --provider lxc -``` - -- `DEBIAN_CODENAME`: `jessie` or `stretch` -- `DISTRIB`: `unstable`. - -You can now log into your box with `vagrant ssh stretch-unstable` - -## Package your own boxes - -You can package it to use it more quickly later: - -```bash -vagrant up stretch-unstable --provider lxc -vagrant package stretch-unstable --output ./my-yunohost-stretch-unstable-lxc.box --provider lxc -vagrant box add my-yunohost/stretch-unstable ./my-yunohost-stretch-unstable-lxc.box --provider lxc -``` From 0aae3279046389d8f7fc84d62e587c5be0d86bae Mon Sep 17 00:00:00 2001 From: ljf Date: Thu, 4 Oct 2018 14:24:32 +0200 Subject: [PATCH 4/8] [fix] Remove a patch no longer needed --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index c67e6cb..8574927 100644 --- a/README.md +++ b/README.md @@ -39,11 +39,8 @@ echo "cgroup /sys/fs/cgroup cgroup defaults 0 0" | su sudo mount /sys/fs/cgroup lxc-checkconfig echo "veth" | sudo tee -a /etc/modules -wget https://raw.githubusercontent.com/fgrehm/vagrant-lxc/2a5510b34cc59cd3cb8f2dcedc3073852d841101/lib/vagrant-lxc/driver.rb -O ~/.vagrant.d/gems/2.5.1/gems/vagrant-lxc-1.4.2/lib/vagrant-lxc/driver.rb ``` -(in the last command, you might want to adapt the `gems/2.5.1` folder) - If you run Archlinux, this page should be quite useful to setup LXC : https://github.com/fgrehm/vagrant-lxc/wiki/Usage-on-Arch-Linux-hosts Then, go into your favorite development folder and deploy ynh-dev with : From 34dd108b24c83d04a7de353bea9a42bcaada99c9 Mon Sep 17 00:00:00 2001 From: Bram Date: Sun, 7 Oct 2018 17:19:37 +0200 Subject: [PATCH 5/8] [doc] add instruction to use upstream vagrant version --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 437540f..df3a000 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,8 @@ These operation need to be done on the host machine. #### Install dependencies +Please consider using the [latest Vagrant version from their website](https://www.vagrantup.com/downloads.html), distribution versions can include weird bugs that have been fixed upstream. If you still prefer to do that, here are the instructions: + - Debian, Ubuntu, Mint ```bash From dc6f6a6c4f5004873d917ff9114ba757efe071f0 Mon Sep 17 00:00:00 2001 From: FurryJulie Date: Sun, 28 Oct 2018 18:31:23 +0100 Subject: [PATCH 6/8] Add .vagrant in gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dc8719b..4ca7c29 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ vagrant ynh-dev-tools Vagrantfile +.vagrant # Sources repositories moulinette From c8ff55b0fbe6daa38b6ce024c2ea43b06c971103 Mon Sep 17 00:00:00 2001 From: FurryJulie Date: Sun, 28 Oct 2018 18:57:44 +0100 Subject: [PATCH 7/8] [doc] fix a minor typo in the README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df3a000..871defb 100644 --- a/README.md +++ b/README.md @@ -129,7 +129,7 @@ corresponding path. You can link your VM to use these git clones such that chang /vagrant/ynh-dev use-git PACKAGE ``` -PACKAGE should can be ssowat, yunohost, moulinette or yunohost-admin. You might want to run use-git several times depending on what you want to develop precisely. +PACKAGE can be ssowat, yunohost, moulinette or yunohost-admin. You might want to run use-git several times depending on what you want to develop precisely. ***Note***: The `use-git` operation can't be reverted now. DON'T DO THIS IN PRODUCTION ! From 2ba5f5bb3f20de6ce154b9cfcd7e5fb28d0c69c0 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 10 Dec 2018 03:27:34 +0100 Subject: [PATCH 8/8] Check postinstall has been done before running tests --- ynh-dev | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ynh-dev b/ynh-dev index db693be..adbd087 100755 --- a/ynh-dev +++ b/ynh-dev @@ -293,7 +293,8 @@ function run_tests() git pull > /dev/null 2>&1 # Run tests - echo "Running tests for YunoHost" + info "Running tests for YunoHost ..." + [ -e "/etc/yunohost/installed" ] || critical "You should run postinstallation before running tests :s." cd /ynh-dev/yunohost/ py.test tests cd /ynh-dev/yunohost/src/yunohost