diff --git a/ct/alpine-it-tools.sh b/ct/alpine-it-tools.sh index b6c36d71c..8d7690945 100644 --- a/ct/alpine-it-tools.sh +++ b/ct/alpine-it-tools.sh @@ -9,7 +9,7 @@ APP="Alpine-IT-Tools" var_tags="${var_tags:-alpine;development}" var_cpu="${var_cpu:-1}" var_ram="${var_ram:-256}" -var_disk="${var_disk:-0.2}" +var_disk="${var_disk:-0.5}" var_os="${var_os:-alpine}" var_version="${var_version:-3.21}" var_unprivileged="${var_unprivileged:-1}" @@ -20,32 +20,32 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources + header_info + check_container_storage + check_container_resources - if [ ! -d /usr/share/nginx/html ]; then - msg_error "No ${APP} Installation Found!" - exit 1 - fi + if [ ! -d /usr/share/nginx/html ]; then + msg_error "No ${APP} Installation Found!" + exit 1 + fi - RELEASE=$(curl -fsSL https://api.github.com/repos/CorentinTh/it-tools/releases/latest | grep '"tag_name":' | cut -d '"' -f4) - if [ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ] || [ ! -f /opt/${APP}_version.txt ]; then - DOWNLOAD_URL="https://github.com/CorentinTh/it-tools/releases/download/${RELEASE}/it-tools-${RELEASE#v}.zip" - msg_info "Updating ${APP} LXC" - curl -fsSL -o it-tools.zip "$DOWNLOAD_URL" - mkdir -p /usr/share/nginx/html - rm -rf /usr/share/nginx/html/* - unzip -q it-tools.zip -d /tmp/it-tools - cp -r /tmp/it-tools/dist/* /usr/share/nginx/html - rm -rf /tmp/it-tools - rm -f it-tools.zip - msg_ok "Updated Successfully" - else - msg_ok "No update required. ${APP} is already at ${RELEASE}" - fi + RELEASE=$(curl -fsSL https://api.github.com/repos/CorentinTh/it-tools/releases/latest | grep '"tag_name":' | cut -d '"' -f4) + if [ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ] || [ ! -f /opt/${APP}_version.txt ]; then + DOWNLOAD_URL="https://github.com/CorentinTh/it-tools/releases/download/${RELEASE}/it-tools-${RELEASE#v}.zip" + msg_info "Updating ${APP} LXC" + curl -fsSL -o it-tools.zip "$DOWNLOAD_URL" + mkdir -p /usr/share/nginx/html + rm -rf /usr/share/nginx/html/* + unzip -q it-tools.zip -d /tmp/it-tools + cp -r /tmp/it-tools/dist/* /usr/share/nginx/html + rm -rf /tmp/it-tools + rm -f it-tools.zip + msg_ok "Updated Successfully" + else + msg_ok "No update required. ${APP} is already at ${RELEASE}" + fi - exit 0 + exit 0 } start @@ -55,4 +55,4 @@ 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 IP:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" diff --git a/ct/alpine.sh b/ct/alpine.sh index 856bde8da..95ea5d841 100644 --- a/ct/alpine.sh +++ b/ct/alpine.sh @@ -9,7 +9,7 @@ APP="Alpine" var_tags="${var_tags:-os;alpine}" var_cpu="${var_cpu:-1}" var_ram="${var_ram:-512}" -var_disk="${var_disk:-0.1}" +var_disk="${var_disk:-0.5}" var_os="${var_os:-alpine}" var_version="${var_version:-3.21}" var_unprivileged="${var_unprivileged:-1}" @@ -20,9 +20,11 @@ color catch_errors function update_script() { - UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 1 \ - "1" "Check for Alpine Updates" ON \ - 3>&1 1>&2 2>&3) + UPD=$( + whiptail --backtitle "Proxmox VE Helper Scripts" --title "SUPPORT" --radiolist --cancel-button Exit-Script "Spacebar = Select" 11 58 1 \ + "1" "Check for Alpine Updates" ON \ + 3>&1 1>&2 2>&3 + ) header_info if [ "$UPD" == "1" ]; then @@ -35,4 +37,4 @@ start build_container description -msg_ok "Completed Successfully!\n" \ No newline at end of file +msg_ok "Completed Successfully!\n" diff --git a/frontend/public/json/alpine-it-tools.json b/frontend/public/json/alpine-it-tools.json index c4ea46f0c..af1b94a0c 100644 --- a/frontend/public/json/alpine-it-tools.json +++ b/frontend/public/json/alpine-it-tools.json @@ -2,7 +2,7 @@ "name": "Alpine-IT-Tools", "slug": "alpine-it-tools", "categories": [ - 20 + 20 ], "date_created": "2025-01-30", "type": "ct", @@ -15,33 +15,32 @@ "config_path": "", "description": "IT-Tools is a web-based suite of utilities designed to streamline and simplify various IT tasks, providing tools for developers and system administrators to manage their workflows efficiently.", "install_methods": [ - { - "type": "default", - "script": "ct/alpine-it-tools.sh", - "resources": { - "cpu": 1, - "ram": 256, - "hdd": 0.2, - "os": "alpine", - "version": "3.21" - } - }, - { - "type": "alpine", - "script": "ct/alpine-it-tools.sh", - "resources": { - "cpu": 1, - "ram": 256, - "hdd": 0.2, - "os": "alpine", - "version": "3.21" - } + { + "type": "default", + "script": "ct/alpine-it-tools.sh", + "resources": { + "cpu": 1, + "ram": 256, + "hdd": 0.5, + "os": "alpine", + "version": "3.21" } + }, + { + "type": "alpine", + "script": "ct/alpine-it-tools.sh", + "resources": { + "cpu": 1, + "ram": 256, + "hdd": 0.5, + "os": "alpine", + "version": "3.21" + } + } ], "default_credentials": { - "username": null, - "password": null + "username": null, + "password": null }, "notes": [] } - diff --git a/frontend/public/json/alpine.json b/frontend/public/json/alpine.json index dc77f9fe7..6510d21e3 100644 --- a/frontend/public/json/alpine.json +++ b/frontend/public/json/alpine.json @@ -1,52 +1,51 @@ { - "name": "Alpine", - "slug": "alpine", - "categories": [ - 2 - ], - "date_created": "2024-05-02", - "type": "ct", - "updateable": false, - "privileged": false, - "interface_port": null, - "documentation": null, - "website": "https://www.alpinelinux.org/", - "logo": "https://raw.githubusercontent.com/loganmarchione/homelab-svg-assets/main/assets/alpinelinux.svg", - "config_path": "", - "description": "A security-oriented, lightweight Linux distribution based on musl and BusyBox.\r\nBy default, the root password is set to alpine. If you choose to use advanced settings, you will need to define a password, autologin is currently unavailable.", - "install_methods": [ - { - "type": "default", - "script": "ct/alpine.sh", - "resources": { - "cpu": 1, - "ram": 512, - "hdd": 0.1, - "os": "alpine", - "version": "3.21" - } - }, - { - "type": "alpine", - "script": "ct/alpine.sh", - "resources": { - "cpu": 1, - "ram": 512, - "hdd": 0.1, - "os": "alpine", - "version": "3.21" - } - } - ], - "default_credentials": { - "username": null, - "password": "alpine" + "name": "Alpine", + "slug": "alpine", + "categories": [ + 2 + ], + "date_created": "2024-05-02", + "type": "ct", + "updateable": false, + "privileged": false, + "interface_port": null, + "documentation": null, + "website": "https://www.alpinelinux.org/", + "logo": "https://raw.githubusercontent.com/loganmarchione/homelab-svg-assets/main/assets/alpinelinux.svg", + "config_path": "", + "description": "A security-oriented, lightweight Linux distribution based on musl and BusyBox.\r\nBy default, the root password is set to alpine. If you choose to use advanced settings, you will need to define a password, autologin is currently unavailable.", + "install_methods": [ + { + "type": "default", + "script": "ct/alpine.sh", + "resources": { + "cpu": 1, + "ram": 512, + "hdd": 0.5, + "os": "alpine", + "version": "3.21" + } }, - "notes": [ - { - "text": "To Update Alpine: `apk update && apk upgrade`", - "type": "info" - } - ] + { + "type": "alpine", + "script": "ct/alpine.sh", + "resources": { + "cpu": 1, + "ram": 512, + "hdd": 0.5, + "os": "alpine", + "version": "3.21" + } + } + ], + "default_credentials": { + "username": null, + "password": "alpine" + }, + "notes": [ + { + "text": "To Update Alpine: `apk update && apk upgrade`", + "type": "info" + } + ] } -