Merge f3db85739e into 5d69a62b47

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

CHANGELOG.md

@@ -17,6 +17,14 @@ All LXC instances created using this repository come pre-installed with Midnight
 Do not break established syntax in this file, as it is automatically updated by a Github Workflow
 
 
+## 2025-01-19
+
+### Changed
+
+### 🚀 Updated Scripts
+
+- Update Opengist.sh: Fix broken backup function [@bvdberg01](https://github.com/bvdberg01) ([#1572](https://github.com/community-scripts/ProxmoxVE/pull/1572))
+
 ## 2025-01-18
 
 ### Changed

README.md

@@ -17,7 +17,7 @@
       <img src="https://img.shields.io/badge/Discord-7289da?style=for-the-badge&logo=discord&logoColor=white" alt="Discord" />
     </a> 
     <a href="https://ko-fi.com/community_scripts">
-      <img src="https://img.shields.io/badge/Donate-FF5F5F?style=for-the-badge&logo=ko-fi&logoColor=white" alt="Donate" />
+      <img src="https://img.shields.io/badge/Support-FF5F5F?style=for-the-badge&logo=ko-fi&logoColor=white" alt="Donate" />
     </a>
     <a href="https://github.com/community-scripts/ProxmoxVE/blob/main/.github/CONTRIBUTING.md">
       <img src="https://img.shields.io/badge/Contribute-ff4785?style=for-the-badge&logo=git&logoColor=white" alt="Contribute" />

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}"

ct/opengist.sh

@@ -32,29 +32,35 @@ function update_script() {
     msg_error "No ${APP} Installation Found!"
     exit
   fi
+  RELEASE=$(curl -s https://api.github.com/repos/thomiceli/opengist/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
     msg_info "Stopping Service"
     systemctl stop opengist.service
     msg_ok "Stopped Service"
-  apt-get update &>/dev/null
-  apt-get upgrade &>/dev/null
-  RELEASE=$(curl -s https://api.github.com/repos/thomiceli/opengist/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+    
     msg_info "Updating ${APP} to v${RELEASE}"
+    apt-get update &>/dev/null
+    apt-get -y upgrade &>/dev/null
     cd /opt
-    wget -qO "https://github.com/thomiceli/opengist/releases/download/v${RELEASE}/opengist${RELEASE}-linux-amd64.tar.gz"
-    rm -rf /opt/opengist
+    mv /opt/opengist /opt/opengist-backup
+    wget -q "https://github.com/thomiceli/opengist/releases/download/v${RELEASE}/opengist${RELEASE}-linux-amd64.tar.gz"
     tar -xzf opengist${RELEASE}-linux-amd64.tar.gz
+    mv /opt/opengist-backup/config.yml /opt/opengist/config.yml
     chmod +x /opt/opengist/opengist
     echo "${RELEASE}" >"/opt/${APP}_version.txt"
-    rm -rf /opt/opengist${RELEASE}-linux-amd64.tar.gz
-    apt-get -y autoremove &>/dev/null
-    apt-get -y autoclean &>/dev/null
     msg_ok "Updated ${APP} LXC"
 
     msg_info "Starting Service"
     systemctl start opengist.service
     msg_ok "Started Service"
 
+    msg_info "Cleaning up"
+    rm -rf /opt/opengist${RELEASE}-linux-amd64.tar.gz
+    rm -rf /opt/opengist-backup
+    apt-get -y autoremove &>/dev/null
+    apt-get -y autoclean &>/dev/null
+    msg_ok "Cleaned"
+    msg_ok "Updated Successfully"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}."
   fi

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": []
+}

json/opengist.json

@@ -6,7 +6,7 @@
     ],
     "date_created": "2025-01-14",
     "type": "ct",
-    "updateable": false,
+    "updateable": true,
     "privileged": false,
     "interface_port": 6157,
     "documentation": null,

misc/.app-headers

@@ -1,4 +1,4 @@
-### Generated on 01-18-2025
+### Generated on 01-19-2025
 ##################################################
 
 ### 2fauth.sh