Merge f3db85739e into 4dcf0dc0b8

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

CHANGELOG.md

@@ -28,8 +28,8 @@ Do not break established syntax in this file, as it is automatically updated by
 
 ### 🚀 Updated Scripts
 
+- Update Kimai Dependency: Use PHP 8.3 [@MickLesk](https://github.com/MickLesk) ([#1609](https://github.com/community-scripts/ProxmoxVE/pull/1609))
 - Feature: Add xCaddy for external Modules on Caddy-LXC [@MickLesk](https://github.com/MickLesk) ([#1613](https://github.com/community-scripts/ProxmoxVE/pull/1613))
-- Update Kimai Dependency: Use PHP 8.4  [@MickLesk](https://github.com/MickLesk) ([#1609](https://github.com/community-scripts/ProxmoxVE/pull/1609))
 - Fix Pocketbase URL after install [@MickLesk](https://github.com/MickLesk) ([#1597](https://github.com/community-scripts/ProxmoxVE/pull/1597))
 - Unifi.sh fix wrong URL after Install [@thost96](https://github.com/thost96) ([#1601](https://github.com/community-scripts/ProxmoxVE/pull/1601))
 
@@ -40,6 +40,7 @@ Do not break established syntax in this file, as it is automatically updated by
 
 ### 🧰 Maintenance
 
+- [core] Update build.func: Add defaults to Advanced mode [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1548](https://github.com/community-scripts/ProxmoxVE/pull/1548))
 - Update build.func: Fix Advanced Tags (Remove all if empty / overwrite if default cleared) [@michelroegl-brunner](https://github.com/michelroegl-brunner) ([#1612](https://github.com/community-scripts/ProxmoxVE/pull/1612))
 - Add new Check for LXC MaxKeys by @cricalix [@MickLesk](https://github.com/MickLesk) ([#1602](https://github.com/community-scripts/ProxmoxVE/pull/1602))
 

ct/mealie.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+source <(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: TheRealVira
+# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
+# Source: https://github.com/mealie-recipes/mealie
+
+# App Default Values
+APP="mealie"
+var_tags="food"
+var_cpu="2"
+var_ram="2048"
+var_disk="6"
+var_os="debian"
+var_version="12"
+var_unprivileged="1"
+
+# App Output & Base Settings
+header_info "$APP"
+base_settings
+
+# Core
+variables
+color
+catch_errors
+
+function update_script() {
+    header_info
+    check_container_storage
+    check_container_resources
+
+    # Check if installation is present | -f for file, -d for folder
+    if [[ ! -d "/opt/${APP}" ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+
+    RELEASE=$(curl -s https://api.github.com/repos/mealie-recipes/mealie/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+    if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f "/opt/${APP}_version.txt" ]]; then
+        # Crawling the new version and checking whether an update is required
+        msg_info "Updating System"
+        apt-get update &>/dev/null
+        apt-get -y upgrade &>/dev/null
+        msg_ok "Updated System"
+
+        # Execute Update
+        msg_info "Updating ${APP}"
+        # TBD
+
+        echo "${RELEASE}" >/opt/${APP}_version.txt
+        msg_ok "Updated ${APP}"
+
+        # Cleaning up
+        msg_info "Cleaning Up"
+        rm "${RELEASE}.zip"
+        $STD apt-get -y autoremove
+        $STD apt-get -y autoclean
+        msg_ok "Cleanup Completed"
+    else
+        msg_ok "No update required. ${APP} is already at ${RELEASE}"
+    fi
+    exit
+}
+
+start
+build_container
+description
+
+msg_ok "Completed Successfully!\n"
+echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}"
+echo -e "${INFO}${YW} Access it using the following URL:${CL}"
+echo -e "${TAB}${GATEWAY}${BGN}http://${IP}:9000${CL}"

install/kimai-install.sh

@@ -87,6 +87,7 @@ send "helper-scripts.com\r"
 
 expect eof
 EOF
+$STD composer update --no-interaction
 echo "${RELEASE}" >"/opt/${APPLICATION}_version.txt"
 msg_ok "Installed Kimai"
 

install/mealie-install.sh

@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+
+# Copyright (c) 2021-2025 community-scripts ORG
+# Author: TheRealVira
+# License: MIT
+# Source: https://github.com/mealie-recipes/mealie
+
+# Import Functions und Setup
+source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
+color
+verb_ip6
+catch_errors
+setting_up_container
+network_check
+update_os
+
+msg_info "Installing Dependencies"
+$STD apt-get install -y \
+    nodejs \
+    npm \
+    sudo \
+    git \
+    python3 \
+    curl \
+    mc \
+    build-essential \
+    libwebp-dev \
+    libsasl2-dev \
+    libldap2-dev \
+    libssl-dev \
+    gnupg \
+    gnupg2 \
+    gnupg1 \
+    gosu \
+    iproute2 \
+    libldap-common \
+    libldap-2.5
+
+mkdir /app
+npm install -g yarn
+msg_ok "Installed Dependencies"
+
+RELEASE=$(curl -s https://api.github.com/repos/mealie-recipes/mealie/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
+msg_info "Downloading mealie ${RELEASE}"
+wget -q "https://github.com/mealie-recipes/mealie/archive/refs/tags/${RELEASE}.zip"
+unzip "${RELEASE}.zip" -d /app/mealie
+echo "${RELEASE}" >/app/mealie_version.txt
+msg_ok "Downloading mealie ${RELEASE}"
+
+msg_info "Setting up frontend"
+cd /app/mealie
+/usr/local/bin/yarn install \
+    --prefer-offline \
+    --frozen-lockfile \
+    --non-interactive \
+    --production=false \
+    --network-timeout=1000000
+/usr/local/bin/yarn generate
+msg_ok "Setting up frontend"
+
+msg_info "Setting up ENV"
+cat <<EOF >>/etc/environment
+MEALIE_HOME="/app"
+
+PYTHONUNBUFFERED=1
+PYTHONDONTWRITEBYTECODE=1
+PIP_NO_CACHE_DIR=off
+PIP_DISABLE_PIP_VERSION_CHECK=on
+PIP_DEFAULT_TIMEOUT=100
+POETRY_HOME="/opt/poetry"
+POETRY_VIRTUALENVS_IN_PROJECT=true
+POETRY_NO_INTERACTION=1
+POETRY_VERSION=1.3.1
+PYSETUP_PATH="/opt/pysetup"
+VENV_PATH="/opt/pysetup/.venv"
+
+PRODUCTION=true
+TESTING=false
+LD_LIBRARY_PATH=/usr/local/lib
+APP_PORT=9000
+STATIC_FILES=/spa/static
+HOST 0.0.0.0
+EOF
+export PATH="$POETRY_HOME/bin:$VENV_PATH/bin:$PATH"
+set -a; source /etc/environment; set +a;
+msg_ok "Setting up ENV"
+
+msg_info "Create user account"
+useradd -u 911 -U -d $MEALIE_HOME -s /bin/bash abc
+usermod -G users abc
+msg_ok "Create user account"
+
+msg_info "Builder Image"
+pip install -U --no-cache-dir pip
+curl -sSL https://install.python-poetry.org | python3 -
+cd $PYSETUP_PATH
+cp ./poetry.lock ./pyproject.toml ./
+poetry install -E pgsql --only main
+msg_ok "Builder Image"
+
+msg_info "CRFPP Image"
+mkdir -p /run/secrets
+cp ./mealie $MEALIE_HOME/mealie
+cp ./poetry.lock ./pyproject.toml $MEALIE_HOME/
+cd $MEALIE_HOME
+. $VENV_PATH/bin/activate
+poetry install -E pgsql --only main
+cd ~
+python $MEALIE_HOME/mealie/scripts/install_model.py
+msg_ok "CRFPP Image"
+
+msg_info "Copy Frontend"
+cp /app/dist $STATIC_FILES
+cp ./docker/entry.sh $MEALIE_HOME/run.sh
+chmod +x $MEALIE_HOME/run.sh
+$MEALIE_HOME/run.sh
+msg_ok "Copy Frontend"
+
+motd_ssh
+customize

json/mealie.json

@@ -0,0 +1,34 @@
+{
+    "name": "mealie",
+    "slug": "mealie",
+    "categories": [
+        0
+    ],
+    "date_created": "2025-01-01",
+    "type": "ct",
+    "updateable": true,
+    "privileged": false,
+    "interface_port": 9000,
+    "documentation": "https://docs.mealie.io/",
+    "website": "https://mealie.io/",
+    "logo": "https://raw.githubusercontent.com/mealie-recipes/mealie/refs/heads/mealie-next/docs/docs/assets/img/favicon.png",
+    "description": "A self-hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in Vue for a pleasant user experience for the whole family.",
+    "install_methods": [
+        {
+            "type": "default",
+            "script": "ct/mealie.sh",
+            "resources": {
+                "cpu": 2,
+                "ram": 2048,
+                "hdd": 6,
+                "os": "debian",
+                "version": "12"
+            }
+        }
+    ],
+    "default_credentials": {
+        "username": null,
+        "password": null
+    },
+    "notes": []
+}

misc/build.func

@@ -382,74 +382,167 @@ exit_script() {
 # This function allows the user to configure advanced settings for the script.
 advanced_settings() {
   whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Here is an instructional tip:" "To make a selection, use the Spacebar." 8 58
-  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
+  whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Default distribution for $APP" "Default is: ${var_os} ${var_version} \n \nIf the default Linux distribution is not adhered to, script support will be discontinued. \n" 10 58
-  if [ "$var_os" != "alpine" ]; then
+    if [ "$var_os" != "alpine" ]; then
+    var_default_os="${var_os}"
     var_os=""
     while [ -z "$var_os" ]; do
-      if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution:" 10 58 2 \
+        if [ "$var_default_os" == "debian" ]; then
-        "debian" "" OFF \
+          if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
-        "ubuntu" "" OFF \
+            "debian" "" ON \
-        3>&1 1>&2 2>&3); then
+            "ubuntu" "" OFF \
-        if [ -n "$var_os" ]; then
+            3>&1 1>&2 2>&3); then
-          echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            if [ -n "$var_os" ]; then
+              echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            fi
+          else
+            exit_script
+          fi
+        fi
+        if [ "$var_default_os" == "ubuntu" ]; then
+          if var_os=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DISTRIBUTION" --radiolist "Choose Distribution" 10 58 2 \
+            "debian" "" OFF \
+            "ubuntu" "" ON \
+            3>&1 1>&2 2>&3); then
+            if [ -n "$var_os" ]; then
+              echo -e "${OS}${BOLD}${DGN}Operating System: ${BGN}$var_os${CL}"
+            fi
+          else
+            exit_script
+          fi
         fi
-      else
-        exit_script
-      fi
     done
   fi
 
   if [ "$var_os" == "debian" ]; then
+    var_default_version="${var_version}"
     var_version=""
     while [ -z "$var_version" ]; do
-      if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+      if [ "$var_default_version" == "11" ]; then  
-        "11" "Bullseye" OFF \
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
-        "12" "Bookworm" OFF \
+          "11" "Bullseye" ON \
-        3>&1 1>&2 2>&3); then
+          "12" "Bookworm" OFF \
-        if [ -n "$var_version" ]; then
+          3>&1 1>&2 2>&3); then
-          echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "12" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "DEBIAN VERSION" --radiolist "Choose Version" 10 58 2 \
+          "11" "Bullseye" OFF \
+          "12" "Bookworm" ON \
+          3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
         fi
-      else
-        exit_script
       fi
     done
   fi
 
   if [ "$var_os" == "ubuntu" ]; then
+    var_default_version="${var_version}"
     var_version=""
     while [ -z "$var_version" ]; do
-      if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+      if [ "$var_default_version" == "20.04" ]; then  
-        "20.04" "Focal" OFF \
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
-        "22.04" "Jammy" OFF \
+          "20.04" "Focal" ON \
-        "24.04" "Noble" OFF \
+          "22.04" "Jammy" OFF \
-        "24.10" "Oracular" OFF \
+          "24.04" "Noble" OFF \
-      3>&1 1>&2 2>&3); then
+          "24.10" "Oracular" OFF \
-        if [ -n "$var_version" ]; then
+        3>&1 1>&2 2>&3); then
-          echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "22.04" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" ON \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "24.04" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" ON \
+          "24.10" "Oracular" OFF \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
+        fi
+      fi
+      if [ "$var_default_version" == "24.10" ]; then
+        if var_version=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UBUNTU VERSION" --radiolist "Choose Version" 10 58 4 \
+          "20.04" "Focal" OFF \
+          "22.04" "Jammy" OFF \
+          "24.04" "Noble" OFF \
+          "24.10" "Oracular" ON \
+        3>&1 1>&2 2>&3); then
+          if [ -n "$var_version" ]; then
+            echo -e "${OSVERSION}${BOLD}${DGN}Version: ${BGN}$var_version${CL}"
+          fi
+        else
+          exit_script
         fi
-      else
-        exit_script
       fi
     done
   fi
   # Setting Default Tag for Advanced Settings
   TAGS="community-script;${var_tags:-}"
-
+  CT_DEFAULT_TYPE="${CT_TYPE}"
   CT_TYPE=""
   while [ -z "$CT_TYPE" ]; do
-    if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+    if [ "$CT_DEFAULT_TYPE" == "1" ]; then 
-      "1" "Unprivileged" OFF \
+      if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
-      "0" "Privileged" OFF \
+        "1" "Unprivileged" ON \
-      3>&1 1>&2 2>&3); then
+        "0" "Privileged" OFF \
-      if [ -n "$CT_TYPE" ]; then
+        3>&1 1>&2 2>&3); then
-        CT_TYPE_DESC="Unprivileged"
+        if [ -n "$CT_TYPE" ]; then
-        if [ "$CT_TYPE" -eq 0 ]; then
+          CT_TYPE_DESC="Unprivileged"
-          CT_TYPE_DESC="Privileged"
+          if [ "$CT_TYPE" -eq 0 ]; then
+            CT_TYPE_DESC="Privileged"
+          fi
+          echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
         fi
-        echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+      else
+        exit_script
+      fi
+    fi
+    if [ "$CT_DEFAULT_TYPE" == "0" ]; then
+      if CT_TYPE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CONTAINER TYPE" --radiolist "Choose Type" 10 58 2 \
+        "1" "Unprivileged" OFF \
+        "0" "Privileged" ON \
+        3>&1 1>&2 2>&3); then
+        if [ -n "$CT_TYPE" ]; then
+          CT_TYPE_DESC="Unprivileged"
+          if [ "$CT_TYPE" -eq 0 ]; then
+            CT_TYPE_DESC="Privileged"
+          fi
+          echo -e "${CONTAINERTYPE}${BOLD}${DGN}Container Type: ${BGN}$CT_TYPE_DESC${CL}"
+        fi
+      else
+        exit_script
       fi
-    else
-      exit_script
     fi
   done
 
@@ -597,7 +690,7 @@ advanced_settings() {
     APT_CACHER=""
     APT_CACHER_IP=""
   else
-    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for default)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
+    if APT_CACHER_IP=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set APT-Cacher IP (leave blank for none)" 8 58 --title "APT-Cacher IP" 3>&1 1>&2 2>&3); then
       APT_CACHER="${APT_CACHER_IP:+yes}"
       echo -e "${NETWORK}${BOLD}${DGN}APT-Cacher IP Address: ${BGN}${APT_CACHER_IP:-Default}${CL}"
     else
@@ -612,7 +705,7 @@ advanced_settings() {
   fi
   echo -e "${DISABLEIPV6}${BOLD}${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
 
-  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default)" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
+  if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default [1500])" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z $MTU1 ]; then
       MTU1="Default"
       MTU=""
@@ -649,7 +742,7 @@ advanced_settings() {
     exit_script
   fi
 
-  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for default)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
+  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a MAC Address(leave blank for generated MAC)" 8 58 --title "MAC ADDRESS" 3>&1 1>&2 2>&3); then
     if [ -z $MAC1 ]; then
       MAC1="Default"
       MAC=""
@@ -661,7 +754,7 @@ advanced_settings() {
     exit_script
   fi
 
-  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for default)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
+  if VLAN1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a Vlan(leave blank for no VLAN)" 8 58 --title "VLAN" 3>&1 1>&2 2>&3); then
     if [ -z $VLAN1 ]; then
       VLAN1="Default"
       VLAN=""