YunoHost-Apps/lxd_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lxd_ynh.git synced 2024-09-03 19:45:53 +02:00
Code Issues Activity Actions 1

Merge pull request #31 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
Kayou 2022-02-25 16:08:35 +01:00 committed by GitHub
commit 0736d1b352
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Offers a user experience similar to virtual machines but using Linux containers instead. Offers a user experience similar to virtual machines but using Linux containers instead.
**Shipped version:** 4.22~ynh2 **Shipped version:** 4.23~ynh1
**Demo:** https://linuxcontainers.org/lxd/try-it/ **Demo:** https://linuxcontainers.org/lxd/try-it/

2
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place. Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place.
**Version incluse :** 4.22~ynh2 **Version incluse :** 4.23~ynh1
**Démo :** https://linuxcontainers.org/lxd/try-it/ **Démo :** https://linuxcontainers.org/lxd/try-it/

4
conf/lxd.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.22/lxd-4.22.tar.gz SOURCE_URL=https://github.com/lxc/lxd/releases/download/lxd-4.23/lxd-4.23.tar.gz
SOURCE_SUM=0977e4b8ae854278194b15f3dc6472d217b9619a024d03f60e95393352212385 SOURCE_SUM=6cfcc7f4c462ae09776ffc24918211844bebcafcbfe4cd98f4b2cfa83e082fc5
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

9
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Offers a user experience similar to virtual machines but using Linux containers instead.", "en": "Offers a user experience similar to virtual machines but using Linux containers instead.",
"fr": "Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place." "fr": "Offre une expérience utilisateur similaire aux machines virtuelles mais en utilisant des conteneurs Linux à la place."
}, },
"version": "4.22~ynh2", "version": "4.23~ynh1",
"url": "https://example.com", "url": "https://example.com",
"upstream": { "upstream": {
"license": "Apache-2.0", "license": "Apache-2.0",
@ -24,11 +24,8 @@
"yunohost": ">= 4.2.8" "yunohost": ">= 4.2.8"
}, },
"multi_instance": false, "multi_instance": false,
"services": [ "services": [],
],
"arguments": { "arguments": {
"install" : [ "install": []
]
} }
} }

3
scripts/backup
View file

@ -56,7 +56,8 @@ ynh_backup --src_path="/usr/local/bin/lxc-to-lxd"
ynh_backup --src_path="/usr/local/bin/lxd" ynh_backup --src_path="/usr/local/bin/lxd"
ynh_backup --src_path="/usr/local/bin/lxd-agent" ynh_backup --src_path="/usr/local/bin/lxd-agent"
ynh_backup --src_path="/usr/local/bin/lxd-benchmark" ynh_backup --src_path="/usr/local/bin/lxd-benchmark"
ynh_backup --src_path="/usr/local/bin/lxd-p2c" ynh_backup --src_path="/usr/local/bin/lxd-migrate"
ynh_backup --src_path="/usr/local/bin/lxd-user"
ynh_backup --src_path="/etc/bash_completion.d/lxd-client" ynh_backup --src_path="/etc/bash_completion.d/lxd-client"
ynh_backup --src_path="/etc/dnsmasq.d/lxd" ynh_backup --src_path="/etc/dnsmasq.d/lxd"

2
scripts/install
View file

@ -78,7 +78,7 @@ ynh_exec_warn_less make
mkdir -p /usr/local/lib/$app mkdir -p /usr/local/lib/$app
mkdir -p /var/log/$app mkdir -p /var/log/$app
cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-migrate,lxd-user} /usr/local/bin
cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
popd popd

3
scripts/remove
View file

@ -78,7 +78,8 @@ ynh_secure_remove --file="/usr/local/bin/lxc-to-lxd"
ynh_secure_remove --file="/usr/local/bin/lxd" ynh_secure_remove --file="/usr/local/bin/lxd"
ynh_secure_remove --file="/usr/local/bin/lxd-agent" ynh_secure_remove --file="/usr/local/bin/lxd-agent"
ynh_secure_remove --file="/usr/local/bin/lxd-benchmark" ynh_secure_remove --file="/usr/local/bin/lxd-benchmark"
ynh_secure_remove --file="/usr/local/bin/lxd-p2c" ynh_secure_remove --file="/usr/local/bin/lxd-migrate"
ynh_secure_remove --file="/usr/local/bin/lxd-user"
ynh_secure_remove --file="/etc/bash_completion.d/lxd-client" ynh_secure_remove --file="/etc/bash_completion.d/lxd-client"
sed -i "/# Added by lxd$/{N;/root:100000:65536/d}" /etc/sub{u,g}id sed -i "/# Added by lxd$/{N;/root:100000:65536/d}" /etc/sub{u,g}id

3
scripts/restore
View file

@ -78,7 +78,8 @@ ynh_restore_file --origin_path="/usr/local/bin/lxc-to-lxd"
ynh_restore_file --origin_path="/usr/local/bin/lxd" ynh_restore_file --origin_path="/usr/local/bin/lxd"
ynh_restore_file --origin_path="/usr/local/bin/lxd-agent" ynh_restore_file --origin_path="/usr/local/bin/lxd-agent"
ynh_restore_file --origin_path="/usr/local/bin/lxd-benchmark" ynh_restore_file --origin_path="/usr/local/bin/lxd-benchmark"
ynh_restore_file --origin_path="/usr/local/bin/lxd-p2c" ynh_restore_file --origin_path="/usr/local/bin/lxd-migrate"
ynh_restore_file --origin_path="/usr/local/bin/lxd-user"
ynh_restore_file --origin_path="/etc/bash_completion.d/lxd-client" ynh_restore_file --origin_path="/etc/bash_completion.d/lxd-client"
ynh_restore_file --origin_path="/etc/dnsmasq.d/lxd" ynh_restore_file --origin_path="/etc/dnsmasq.d/lxd"

7
scripts/upgrade
View file

@ -41,6 +41,11 @@ ynh_clean_setup () {
# Exit if an error occurs during the execution of the script # Exit if an error occurs during the execution of the script
ynh_abort_if_errors ynh_abort_if_errors
# Remove old file
if [ -f "/usr/local/bin/lxd-p2c" ]; then
ynh_secure_remove --file="/usr/local/bin/lxd-p2c"
fi
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================
@ -96,7 +101,7 @@ ynh_exec_warn_less make
mkdir -p /usr/local/lib/$app mkdir -p /usr/local/lib/$app
mkdir -p /var/log/$app mkdir -p /var/log/$app
cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/ cp -a ${GOPATH}/{raft,dqlite}/.libs/lib*.so* /usr/local/lib/$app/
cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-p2c} /usr/local/bin cp ${GOPATH}/bin/{fuidshift,lxc,lxc-to-lxd,lxd,lxd-agent,lxd-benchmark,lxd-migrate,lxd-user} /usr/local/bin
cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/ cp ${lxd_tmp}/scripts/bash/lxd-client /etc/bash_completion.d/
popd popd