Merge 85eb661c08 into 84b982ffa8

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

CHANGELOG.md

@@ -27,10 +27,12 @@ Do not break established syntax in this file, as it is automatically updated by
 
 ### 🚀 Updated Scripts
 
+- Increase alpine-vaultwarden default var_disk size [@nayzm](https://github.com/nayzm) ([#1788](https://github.com/community-scripts/ProxmoxVE/pull/1788))
 - Added change of the mobile GUI to disable nag request [@GarryG](https://github.com/GarryG) ([#1785](https://github.com/community-scripts/ProxmoxVE/pull/1785))
 
 ### 🌐 Website
 
+- Update frontend alpine-vaultwarden hdd size and OS version [@nayzm](https://github.com/nayzm) ([#1789](https://github.com/community-scripts/ProxmoxVE/pull/1789))
 - Website: Add Description for Metadata Categories [@MickLesk](https://github.com/MickLesk) ([#1783](https://github.com/community-scripts/ProxmoxVE/pull/1783))
 - [Fix] Double "VM" on website (Arch Linux) [@lasharor](https://github.com/lasharor) ([#1782](https://github.com/community-scripts/ProxmoxVE/pull/1782))
 

ct/alpine-vaultwarden.sh

@@ -9,7 +9,7 @@ APP="Alpine-Vaultwarden"
 var_tags="alpine;vault"
 var_cpu="1"
 var_ram="256"
-var_disk="0.3"
+var_disk="0.5"
 var_os="alpine"
 var_version="3.20"
 var_unprivileged="1"

install/alpine-docker-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
 $STD apk add tzdata
-$STD apk add nano
-$STD apk add mc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Docker"

install/alpine-grafana-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Grafana"
 $STD apk add grafana

install/alpine-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/alpine-nextcloud-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add nginx
 msg_ok "Installed Dependencies"
 

install/alpine-vaultwarden-install.sh

@@ -12,14 +12,10 @@ catch_errors
 setting_up_container
 network_check
 update_os
+install_core_packages
 
 msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
 $STD apk add openssl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
 $STD apk add argon2
 msg_ok "Installed Dependencies"
 

install/alpine-zigbee2mqtt-install.sh

@@ -12,14 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apk add newt
-$STD apk add curl
-$STD apk add openssh
-$STD apk add nano
-$STD apk add mc
-msg_ok "Installed Dependencies"
 
 msg_info "Installing Alpine-Zigbee2MQTT"
 $STD apk add zigbee2mqtt

install/debian-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

install/ubuntu-install.sh

@@ -12,12 +12,7 @@ catch_errors
 setting_up_container
 network_check
 update_os
-
+install_core_packages
-msg_info "Installing Dependencies"
-$STD apt-get install -y curl
-$STD apt-get install -y sudo
-$STD apt-get install -y mc
-msg_ok "Installed Dependencies"
 
 motd_ssh
 customize

json/vaultwarden.json

@@ -31,9 +31,9 @@
             "resources": {
                 "cpu": 1,
                 "ram": 256,
-                "hdd": 0.3,
+                "hdd": 0.5,
                 "os": "alpine",
-                "version": "3.19"
+                "version": "3.20"
             }
         }
     ],

misc/alpine-install.func

@@ -133,6 +133,14 @@ update_os() {
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update install.func for apt-based systems as appropriate.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  apk add -q curl mc nano newt openssh sudo &>/dev/null
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode

misc/install.func

@@ -197,6 +197,15 @@ EOF
   msg_ok "Updated Container OS"
 }
 
+# Install core packages that (almost) every container will depend upon.
+# Be sure to update alpine-install.func to match for apk-based systems when
+# adding a new package.
+install_core_packages() {
+  msg_info "Installing Core Packages"
+  apt-get install -y curl mc sudo &> /dev/null
+  msg_ok "Installed Core Packages"
+}
+
 # This function modifies the message of the day (motd) and SSH settings
 motd_ssh() {
   # Set terminal to 256-color mode