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

Merge pull request #69 from YunoHost/bookworm

Browse source 
enh: Bookworm + new portal
This commit is contained in:
Alexandre Aubin 2023-11-11 13:50:27 +01:00 • committed by GitHub
commit 804c95f0a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 90 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
deploy.sh
View file

@ -8,6 +8,7 @@ git clone https://github.com/YunoHost/moulinette
git clone https://github.com/YunoHost/yunohost
git clone https://github.com/YunoHost/yunohost-admin
git clone https://github.com/YunoHost/SSOwat ssowat
git clone https://github.com/YunoHost/yunohost-portal
mkdir -p apps

115
ynh-dev
View file

@ -6,10 +6,10 @@ function show_usage() {
${BLUE}On the host, to manage the LXC${NORMAL}
${BLUE}==============================${NORMAL}
start [DIST] [NAME] [YNH_BRANCH] (Create and) starts a LXC (DIST=bullseye, NAME=ynh-dev and YNH_BRANCH=unstable by default)
attach [DIST] [NAME] [YNH_BRANCH] Attach an already started LXC (DIST=bullseye, NAME=ynh-dev and YNH_BRANCH=unstable by default)
destroy [DIST] [NAME] [YNH_BRANCH] Destroy the ynh-dev LXC (DIST=bullseye, NAME=ynh-dev and YNH_BRANCH=unstable by default)
rebuild [DIST] [NAME] [YNH_BRANCH] Rebuild a fresh, up-to-date box (DIST=bullseye, NAME=ynh-dev and YNH_BRANCH=unstable by default)
start [DIST] [NAME] [YNH_BRANCH] (Create and) starts a LXC (DIST=bookworm, NAME=ynh-dev and YNH_BRANCH=unstable by default)
attach [DIST] [NAME] [YNH_BRANCH] Attach an already started LXC (DIST=bookworm, NAME=ynh-dev and YNH_BRANCH=unstable by default)
destroy [DIST] [NAME] [YNH_BRANCH] Destroy the ynh-dev LXC (DIST=bookworm, NAME=ynh-dev and YNH_BRANCH=unstable by default)
rebuild [DIST] [NAME] [YNH_BRANCH] Rebuild a fresh, up-to-date box (DIST=bookworm, NAME=ynh-dev and YNH_BRANCH=unstable by default)
${BLUE}Inside the dev instance${NORMAL}
${BLUE}=======================${NORMAL}
@ -108,6 +108,10 @@ function assert_inside_vm() {
[ -d /etc/yunohost ] || critical "There's no YunoHost in there. Are you sure that you are inside the container ?"
}
function assert_yunohost_is_installed() {
[ -e /etc/yunohost/installed ] || critical "YunoHost is not yet properly installed. Rerun this after post-install."
}
function create_sym_link() {
local DEST=$1
local LINK=$2
@ -117,6 +121,30 @@ function create_sym_link() {
ln -sfn $DEST $LINK
}
function prepare_cache_and_deps() {
local DEV_PATH="$1"
local CACHE_PATH="$2"
mkdir -p "$CACHE_PATH"
# create_sym_link "$DEV_PATH/.env" "$CACHE_PATH/.env"
create_sym_link "$CACHE_PATH/node_modules" "$DEV_PATH/node_modules"
create_sym_link "$DEV_PATH/package.json" "$CACHE_PATH/package.json"
create_sym_link "$DEV_PATH/yarn.lock" "$CACHE_PATH/yarn.lock"
# install yarn if not already
if [[ $(dpkg-query -W -f='${Status}' yarn 2>/dev/null | grep -c "ok installed") -eq 0 ]];
then
info "Installing yarn…"
apt install yarn
fi
pushd "$CACHE_PATH"
# Install dependencies with yarn forced to lock file versions (equivalent to `npm ci`)
info "Installing dependencies ... (this may take a while)"
yarn install --frozen-lockfile
popd
}
##################################################################
# Actions #
##################################################################
@ -142,7 +170,7 @@ function start_ynhdev()
{
check_lxd_setup
local DIST=${1:-bullseye}
local DIST=${1:-bookworm}
local YNH_BRANCH=${3:-unstable}
local BOX=${2:-ynh-dev}-${DIST}-${YNH_BRANCH}
@ -168,7 +196,7 @@ function start_ynhdev()
function attach_ynhdev()
{
check_lxd_setup
local DIST=${1:-bullseye}
local DIST=${1:-bookworm}
local YNH_BRANCH=${3:-unstable}
local BOX=${2:-ynh-dev}-${DIST}-${YNH_BRANCH}
sudo lxc start $BOX 2>/dev/null || true
@ -178,7 +206,7 @@ function attach_ynhdev()
function destroy_ynhdev()
{
check_lxd_setup
local DIST=${1:-bullseye}
local DIST=${1:-bookworm}
local YNH_BRANCH=${3:-unstable}
local BOX=${2:-ynh-dev}-${DIST}-${YNH_BRANCH}
sudo lxc stop $BOX
@ -189,7 +217,7 @@ function rebuild_ynhdev()
{
check_lxd_setup
local DIST=${1:-bullseye}
local DIST=${1:-bookworm}
local YNH_BRANCH=${3:-unstable}
local BOX=${2:-ynh-dev}-${DIST}-${YNH_BRANCH}
@ -307,24 +335,6 @@ with open(setting_file) as f:
EOF
fi
# Vite require node v14 to parse modern syntax
if [[ ! $(node -v) == v14* ]]
then
DISTRO="$(lsb_release -s -c)"
if [ "$DISTRO" == "buster" ]; then
info "Installing node v14..."
KEYRING=/usr/share/keyrings/nodesource.gpg
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | gpg --dearmor | sudo tee "$KEYRING" >/dev/null
gpg --no-default-keyring --keyring "$KEYRING" --list-keys
VERSION=node_14.x
echo "deb [signed-by=$KEYRING] https://deb.nodesource.com/$VERSION $DISTRO main" | sudo tee /etc/apt/sources.list.d/nodesource.list
fi
apt-get update
apt install nodejs -y
# to return to nodejs debian version
# apt purge nodejs && rm -r /etc/apt/sources.list.d/nodesource.list && apt install nodejs
fi
# Install dependencies with npm install (or rather npm ci)
if [[ -e "/var/cache/ynh-dev/yunohost-admin/node_modules/vue" ]];
then
@ -353,6 +363,59 @@ EOF
IP=$(hostname -I | tr ' ' '\n' | grep "\.")
success "App builded and available at https://$IP/yunohost/admin"
;;
yunohost-portal)
assert_yunohost_is_installed
# open firewall port 3000 (dev server) and 24678 (dev server websocket)
yunohost firewall allow TCP 3000 -4 --no-reload
yunohost firewall allow TCP 24678 -4
local DEV_PATH="/ynh-dev/yunohost-portal"
local CACHE_PATH="/var/cache/ynh-dev/yunohost-portal"
if [[ ! -e "$DEV_PATH/.env" ]];
then
local IP=$(hostname -I | tr ' ' '\n' | grep "\.")
local MAIN_DOMAIN=$(yunohost domain main-domain | cut -d " " -f2)
critical "There's no 'yunohost-portal/.env' file.
Based on your current main domain (but you can use any domain added on your YunoHost instance) the file should look like:
NUXT_PUBLIC_API_IP=\"$MAIN_DOMAIN\"
If not already, add your instance's IP into '/etc/yunohost/.portal-api-allowed-cors-origins' to avoid CORS issues and make sure to add a redirection in your host's '/etc/hosts' which, based on your instance ip and main domain, would be:
$IP $MAIN_DOMAIN"
fi
prepare_cache_and_deps "$DEV_PATH" "$CACHE_PATH"
cd "$DEV_PATH"
info "Now running dev server"
yarn run dev
;;
yunohost-portal-build)
assert_yunohost_is_installed
local DEV_PATH="/ynh-dev/yunohost-portal"
local CACHE_PATH="/var/cache/ynh-dev/yunohost-portal"
local SOURCE_PATH="/usr/share/yunohost/portal"
if [[ ! -e "$SOURCE_PATH-bkp" ]]
then
info "Backuping system yunohost-portal sources…"
mv "$SOURCE_PATH" "$SOURCE_PATH-bkp"
fi
prepare_cache_and_deps "$DEV_PATH" "$CACHE_PATH"
cd "$DEV_PATH"
yarn generate
create_sym_link "$DEV_PATH/.output/public" "$SOURCE_PATH"
local IP=$(hostname -I | tr ' ' '\n' | grep "\.")
local MAIN_DOMAIN=$(yunohost domain main-domain | cut -d " " -f2)
success "App builded and available at http://$MAIN_DOMAIN/yunohost/sso or http://$IP/yunohost/sso"
;;
*)
error "Invalid package '${PACKAGES[i]}': correct arguments are 'yunohost', 'ssowat', 'moulinette', 'yunohost-admin' or nothing for all"
;;