diff --git a/README.md b/README.md index 1c1efd0..256b37e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients*, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal. -**Shipped version:** 1.26.0~ynh1 +**Shipped version:** 1.26.0~ynh2 **Demo:** https://vault.bitwarden.com/#/register diff --git a/README_fr.md b/README_fr.md index f60c976..904c229 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Alternative implementation of the Bitwarden server API written in Rust and compatible with upstream Bitwarden clients*, perfect for self-hosted deployment where running the official resource-heavy service might not be ideal. -**Version incluse :** 1.26.0~ynh1 +**Version incluse :** 1.26.0~ynh2 **Démo :** https://vault.bitwarden.com/#/register diff --git a/manifest.json b/manifest.json index 7c3f5d0..2d0a2ce 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage passwords and other sensitive informations", "fr": "Gérez les mots de passe et autres informations sensibles" }, - "version": "1.26.0~ynh1", + "version": "1.26.0~ynh2", "url": "https://github.com/dani-garcia/vaultwarden", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index 1e26415..848df74 100644 --- a/scripts/install +++ b/scripts/install @@ -93,7 +93,12 @@ ynh_script_progression --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" +docker_arg="" +if [ $YNH_ARCH == "armhf" ] +then + docker_arg="--os_arch_variant=linux/arm/v7" +fi +ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg mkdir -p "$final_path/live/" chmod 750 "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index e719e01..7df7129 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -143,7 +143,12 @@ then ynh_script_progression --message="Upgrading source files..." # Download, check integrity, uncompress the source of vaultwarden from app.src to his build directory - ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" + docker_arg="" + if [ $YNH_ARCH == "armhf" ] + then + docker_arg="--os_arch_variant=linux/arm/v7" + fi + ynh_docker_image_extract --dest_dir="$final_path/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg mkdir -p "$final_path/live/" fi