mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-07-06 22:22:17 +02:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Sam Heinz
|
e39e813436 | ||
|
push-app-to-main[bot]
|
cf9632c1ee |
@@ -499,30 +499,8 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
</details>
|
||||
|
||||
## 2026-07-06
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- Immich: Update libvips to 8.18.4 [@vhsdream](https://github.com/vhsdream) ([#15619](https://github.com/community-scripts/ProxmoxVE/pull/15619))
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- attempt to port docker-vm to support arm64 [@asylumexp](https://github.com/asylumexp) ([#15611](https://github.com/community-scripts/ProxmoxVE/pull/15611))
|
||||
- fix(plane): don't clobber global app var, breaking /usr/bin/update [@asylumexp](https://github.com/asylumexp) ([#15612](https://github.com/community-scripts/ProxmoxVE/pull/15612))
|
||||
|
||||
## 2026-07-05
|
||||
|
||||
### 🆕 New Scripts
|
||||
|
||||
- excalidash ([#15604](https://github.com/community-scripts/ProxmoxVE/pull/15604))
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- fix: homarr: cli [@CrazyWolf13](https://github.com/CrazyWolf13) ([#15603](https://github.com/community-scripts/ProxmoxVE/pull/15603))
|
||||
- immich: vacuum smart_search/face_search before VectorChord bump [@irishpadres](https://github.com/irishpadres) ([#15607](https://github.com/community-scripts/ProxmoxVE/pull/15607))
|
||||
|
||||
## 2026-07-04
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: MickLesk (CanbiZ)
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/ZimengXiong/ExcaliDash
|
||||
|
||||
APP="ExcaliDash"
|
||||
var_tags="${var_tags:-documents;drawing;collaboration}"
|
||||
var_cpu="${var_cpu:-2}"
|
||||
var_ram="${var_ram:-2048}"
|
||||
var_disk="${var_disk:-8}"
|
||||
var_os="${var_os:-debian}"
|
||||
var_version="${var_version:-13}"
|
||||
var_arm64="${var_arm64:-no}"
|
||||
var_unprivileged="${var_unprivileged:-1}"
|
||||
|
||||
header_info "$APP"
|
||||
variables
|
||||
color
|
||||
catch_errors
|
||||
|
||||
function update_script() {
|
||||
header_info
|
||||
check_container_storage
|
||||
check_container_resources
|
||||
|
||||
if [[ ! -d /opt/excalidash ]]; then
|
||||
msg_error "No ${APP} Installation Found!"
|
||||
exit
|
||||
fi
|
||||
|
||||
if check_for_gh_release "excalidash" "ZimengXiong/ExcaliDash"; then
|
||||
msg_info "Stopping Service"
|
||||
systemctl stop excalidash
|
||||
msg_ok "Stopped Service"
|
||||
|
||||
CLEAN_INSTALL=1 fetch_and_deploy_gh_release "excalidash" "ZimengXiong/ExcaliDash" "tarball"
|
||||
ln -sf /opt/excalidash_data/.env /opt/excalidash/backend/.env
|
||||
set -a && source /opt/excalidash_data/.env && set +a
|
||||
|
||||
msg_info "Configuring Database Provider (${DATABASE_PROVIDER:-sqlite})"
|
||||
cd /opt/excalidash/backend
|
||||
sed -i '/datasource db {/,/}/ s/provider = env("[^"]*")/provider = "'"${DATABASE_PROVIDER:-sqlite}"'"/' prisma/schema.prisma
|
||||
mv prisma/migrations/"${DATABASE_PROVIDER:-sqlite}"/* prisma/migrations/
|
||||
rm -rf prisma/migrations/postgresql prisma/migrations/sqlite
|
||||
msg_ok "Configured Database Provider"
|
||||
|
||||
msg_info "Rebuilding Application"
|
||||
$STD npm ci
|
||||
$STD npx prisma generate
|
||||
$STD npx tsc
|
||||
cd /opt/excalidash/frontend
|
||||
$STD npm ci
|
||||
$STD npm run build
|
||||
cp -r /opt/excalidash/frontend/dist/. /var/www/excalidash/
|
||||
msg_ok "Rebuilt Application"
|
||||
|
||||
msg_info "Running Migrations"
|
||||
cd /opt/excalidash/backend
|
||||
$STD npx prisma migrate deploy
|
||||
msg_ok "Ran Migrations"
|
||||
|
||||
msg_info "Starting Service"
|
||||
systemctl start excalidash
|
||||
msg_ok "Started Service"
|
||||
msg_ok "Updated successfully!"
|
||||
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}:6767${CL}"
|
||||
@@ -1,6 +0,0 @@
|
||||
______ ___ ____ __
|
||||
/ ____/ ___________ _/ (_) __ \____ ______/ /_
|
||||
/ __/ | |/_/ ___/ __ `/ / / / / / __ `/ ___/ __ \
|
||||
/ /____> </ /__/ /_/ / / / /_/ / /_/ (__ ) / / /
|
||||
/_____/_/|_|\___/\__,_/_/_/_____/\__,_/____/_/ /_/
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
_____ _ __
|
||||
/ ___/____ ___ __(_)___/ /
|
||||
\__ \/ __ `/ / / / / __ /
|
||||
___/ / /_/ / /_/ / / /_/ /
|
||||
/____/\__, /\__,_/_/\__,_/
|
||||
/_/
|
||||
@@ -35,11 +35,6 @@ function update_script() {
|
||||
systemctl stop redis-server
|
||||
msg_ok "Services Stopped"
|
||||
|
||||
if ! grep -q "source /opt/homarr.env" /usr/bin/homarr 2>/dev/null; then
|
||||
echo $'#!/bin/bash\nset -a\nsource /opt/homarr.env\nset +a\ncd /opt/homarr/apps/cli && timeout 10 node ./cli.cjs "$@"' >/usr/bin/homarr
|
||||
chmod +x /usr/bin/homarr
|
||||
fi
|
||||
|
||||
if ! { grep -q '^REDIS_IS_EXTERNAL=' /opt/homarr/.env 2>/dev/null || grep -q '^REDIS_IS_EXTERNAL=' /opt/homarr.env 2>/dev/null; }; then
|
||||
msg_info "Fixing old structure"
|
||||
systemctl disable -q --now nginx
|
||||
|
||||
+1
-6
@@ -127,11 +127,6 @@ EOF
|
||||
VCHORD_RELEASE="1.0.0"
|
||||
[[ -f ~/.vchord_version ]] && mv ~/.vchord_version ~/.vectorchord
|
||||
if check_for_gh_release "VectorChord" "tensorchord/VectorChord" "${VCHORD_RELEASE}" "updated together with Immich after testing"; then
|
||||
# dead tuples in smart_search/face_search make the REINDEX below fail with
|
||||
# "missing chunk ... for toast value" on VectorChord 1.0.0 (#15588); must vacuum
|
||||
# while still on the old extension version, a post-upgrade vacuum errors instead
|
||||
$STD sudo -u postgres psql -d immich -c "VACUUM (ANALYZE) smart_search;"
|
||||
$STD sudo -u postgres psql -d immich -c "VACUUM (ANALYZE) face_search;"
|
||||
fetch_and_deploy_gh_release "VectorChord" "tensorchord/VectorChord" "binary" "${VCHORD_RELEASE}" "/tmp" "postgresql-16-vchord_*_$(arch_resolve).deb"
|
||||
systemctl restart postgresql
|
||||
$STD sudo -u postgres psql -d immich -c "ALTER EXTENSION vector UPDATE;"
|
||||
@@ -471,7 +466,7 @@ function compile_imagemagick() {
|
||||
|
||||
function compile_libvips() {
|
||||
SOURCE=$SOURCE_DIR/libvips
|
||||
LIBVIPS_REVISION="e01a4797cabe77d457fdfa7d776b7a7e7ca6d6a7"
|
||||
LIBVIPS_REVISION="3664cfc5dc2c5661288f5bf5a85ccc51c64c1626"
|
||||
if [[ "$LIBVIPS_REVISION" != "$(grep 'libvips' ~/.immich_library_revisions | awk '{print $2}')" ]]; then
|
||||
msg_info "Recompiling libvips"
|
||||
[[ -d "$SOURCE" ]] && rm -rf "$SOURCE"
|
||||
|
||||
@@ -60,4 +60,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 URL:${CL}"
|
||||
echo -e "${GATEWAY}${BGN}http://${IP}:21114${CL}"
|
||||
echo -e "${GATEWAY}${BGN}${IP}:21114${CL}"
|
||||
|
||||
+55
@@ -0,0 +1,55 @@
|
||||
#!/usr/bin/env bash
|
||||
source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/build.func)
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: 007hacky007
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://www.squid-cache.org/
|
||||
|
||||
APP="Squid"
|
||||
var_tags="${var_tags:-proxy}"
|
||||
var_cpu="${var_cpu:-1}"
|
||||
var_ram="${var_ram:-512}"
|
||||
var_disk="${var_disk:-4}"
|
||||
var_os="${var_os:-debian}"
|
||||
var_version="${var_version:-13}"
|
||||
var_arm64="${var_arm64:-yes}"
|
||||
var_unprivileged="${var_unprivileged:-1}"
|
||||
|
||||
header_info "$APP"
|
||||
variables
|
||||
color
|
||||
catch_errors
|
||||
|
||||
function update_script() {
|
||||
header_info
|
||||
check_container_storage
|
||||
check_container_resources
|
||||
if [[ ! -f /etc/squid/squid.conf ]]; then
|
||||
msg_error "No ${APP} Installation Found!"
|
||||
exit
|
||||
fi
|
||||
msg_info "Updating Squid"
|
||||
$STD apt update
|
||||
$STD apt upgrade -y
|
||||
msg_ok "Updated Squid"
|
||||
|
||||
msg_info "Validating Squid Configuration"
|
||||
$STD squid -k parse
|
||||
msg_ok "Validated Squid Configuration"
|
||||
|
||||
msg_info "Restarting Squid"
|
||||
systemctl restart squid
|
||||
msg_ok "Restarted Squid"
|
||||
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} Proxy endpoint:${CL}"
|
||||
echo -e "${TAB}${GATEWAY}${BGN}${IP}:3128${CL}"
|
||||
echo -e "${INFO}${YW} Add a proxy user inside the container with:${CL}"
|
||||
echo -e "${TAB}${BGN}htpasswd /etc/squid/passwords <username>${CL}"
|
||||
@@ -1,139 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: MickLesk (CanbiZ)
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://github.com/ZimengXiong/ExcaliDash
|
||||
|
||||
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
||||
color
|
||||
verb_ip6
|
||||
catch_errors
|
||||
setting_up_container
|
||||
network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt install -y \
|
||||
build-essential \
|
||||
nginx
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
NODE_VERSION="20" setup_nodejs
|
||||
PG_VERSION="18" setup_postgresql
|
||||
PG_DB_NAME="excalidash" PG_DB_USER="excalidash" setup_postgresql_db
|
||||
|
||||
fetch_and_deploy_gh_release "excalidash" "ZimengXiong/ExcaliDash" "tarball"
|
||||
|
||||
msg_info "Configuring Database Provider"
|
||||
cd /opt/excalidash/backend
|
||||
sed -i '/datasource db {/,/}/ s/provider = env("[^"]*")/provider = "postgresql"/' prisma/schema.prisma
|
||||
sed -i '/datasource db {/,/}/ s/provider = "[^"]*"/provider = "postgresql"/' prisma/schema.prisma
|
||||
mv prisma/migrations/postgresql/* prisma/migrations/
|
||||
rm -rf prisma/migrations/sqlite prisma/migrations/postgresql
|
||||
msg_ok "Configured Database Provider"
|
||||
|
||||
msg_info "Building Backend"
|
||||
cd /opt/excalidash/backend
|
||||
$STD npm ci
|
||||
$STD npx prisma generate
|
||||
$STD npx tsc
|
||||
msg_ok "Built Backend"
|
||||
|
||||
msg_info "Building Frontend"
|
||||
cd /opt/excalidash/frontend
|
||||
$STD npm ci
|
||||
$STD npm run build
|
||||
msg_ok "Built Frontend"
|
||||
|
||||
msg_info "Configuring Application"
|
||||
mkdir -p /opt/excalidash_data
|
||||
mkdir -p /var/www/excalidash
|
||||
cp -r /opt/excalidash/frontend/dist/. /var/www/excalidash/
|
||||
cat <<EOF >/opt/excalidash_data/.env
|
||||
DATABASE_PROVIDER=postgresql
|
||||
DATABASE_URL=postgresql://${PG_DB_USER}:${PG_DB_PASS}@localhost:5432/${PG_DB_NAME}
|
||||
PORT=8000
|
||||
NODE_ENV=production
|
||||
FRONTEND_URL=http://${LOCAL_IP}:6767
|
||||
AUTH_MODE=local
|
||||
TRUST_PROXY=false
|
||||
RUN_MIGRATIONS=false
|
||||
JWT_SECRET=$(openssl rand -hex 32)
|
||||
CSRF_SECRET=$(openssl rand -base64 32)
|
||||
EOF
|
||||
ln -sf /opt/excalidash_data/.env /opt/excalidash/backend/.env
|
||||
cd /opt/excalidash/backend
|
||||
set -a && source /opt/excalidash_data/.env && set +a
|
||||
$STD npx prisma migrate deploy
|
||||
msg_ok "Configured Application"
|
||||
|
||||
msg_info "Configuring Nginx"
|
||||
cat <<EOF >/etc/nginx/sites-available/excalidash
|
||||
server {
|
||||
listen 6767;
|
||||
server_name _;
|
||||
root /var/www/excalidash;
|
||||
index index.html;
|
||||
client_max_body_size 50M;
|
||||
|
||||
location /api/ {
|
||||
proxy_pass http://127.0.0.1:8000/;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade \$http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host \$host;
|
||||
proxy_set_header X-Real-IP \$remote_addr;
|
||||
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto \$scheme;
|
||||
proxy_read_timeout 300s;
|
||||
proxy_send_timeout 300s;
|
||||
}
|
||||
|
||||
location /socket.io/ {
|
||||
proxy_pass http://127.0.0.1:8000/socket.io/;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade \$http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
proxy_set_header Host \$host;
|
||||
proxy_set_header X-Real-IP \$remote_addr;
|
||||
proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto \$scheme;
|
||||
proxy_read_timeout 3600s;
|
||||
proxy_send_timeout 3600s;
|
||||
}
|
||||
|
||||
location / {
|
||||
try_files \$uri \$uri/ /index.html;
|
||||
}
|
||||
}
|
||||
EOF
|
||||
ln -sf /etc/nginx/sites-available/excalidash /etc/nginx/sites-enabled/excalidash
|
||||
rm -f /etc/nginx/sites-enabled/default
|
||||
systemctl reload nginx
|
||||
msg_ok "Configured Nginx"
|
||||
|
||||
msg_info "Creating Service"
|
||||
cat <<EOF >/etc/systemd/system/excalidash.service
|
||||
[Unit]
|
||||
Description=ExcaliDash Service
|
||||
After=network.target postgresql.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
User=root
|
||||
WorkingDirectory=/opt/excalidash/backend
|
||||
EnvironmentFile=/opt/excalidash/backend/.env
|
||||
ExecStart=/usr/bin/node dist/index.js
|
||||
Restart=on-failure
|
||||
RestartSec=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
systemctl enable -q --now excalidash
|
||||
msg_ok "Created Service"
|
||||
|
||||
motd_ssh
|
||||
customize
|
||||
cleanup_lxc
|
||||
@@ -52,7 +52,7 @@ grep -q '^bind 127.0.0.1 -::1$' /etc/redis/redis.conf || echo "bind 127.0.0.1 -:
|
||||
rm -f /etc/nginx/nginx.conf
|
||||
mkdir -p /etc/nginx/templates
|
||||
cp /opt/homarr/nginx.conf /etc/nginx/templates/nginx.conf
|
||||
echo $'#!/bin/bash\nset -a\nsource /opt/homarr.env\nset +a\ncd /opt/homarr/apps/cli && node ./cli.cjs "$@"' >/usr/bin/homarr
|
||||
echo $'#!/bin/bash\ncd /opt/homarr/apps/cli && node ./cli.cjs "$@"' >/usr/bin/homarr
|
||||
chmod +x /usr/bin/homarr
|
||||
msg_ok "Copied config files"
|
||||
|
||||
|
||||
@@ -282,7 +282,7 @@ msg_ok "(4/5) Compiled imagemagick"
|
||||
|
||||
msg_info "(5/5) Compiling libvips"
|
||||
SOURCE=$SOURCE_DIR/libvips
|
||||
LIBVIPS_REVISION="e01a4797cabe77d457fdfa7d776b7a7e7ca6d6a7"
|
||||
LIBVIPS_REVISION="3664cfc5dc2c5661288f5bf5a85ccc51c64c1626"
|
||||
$STD git clone https://github.com/libvips/libvips.git "$SOURCE"
|
||||
cd "$SOURCE"
|
||||
$STD git reset --hard "$LIBVIPS_REVISION"
|
||||
|
||||
@@ -85,8 +85,8 @@ VITE_SPACE_BASE_PATH=/spaces
|
||||
VITE_LIVE_BASE_URL=http://${LOCAL_IP}
|
||||
VITE_LIVE_BASE_PATH=/live"
|
||||
# Each Vite app needs its own .env for the build
|
||||
for frontend_app in web admin space; do
|
||||
echo "$FRONTEND_ENV" >/opt/plane/apps/${frontend_app}/.env
|
||||
for app in web admin space; do
|
||||
echo "$FRONTEND_ENV" >/opt/plane/apps/${app}/.env
|
||||
done
|
||||
export NODE_OPTIONS="--max-old-space-size=4096"
|
||||
export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
|
||||
|
||||
@@ -0,0 +1,88 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright (c) 2021-2026 community-scripts ORG
|
||||
# Author: 007hacky007
|
||||
# License: MIT | https://github.com/community-scripts/ProxmoxVE/raw/main/LICENSE
|
||||
# Source: https://www.squid-cache.org/
|
||||
|
||||
source /dev/stdin <<<"$FUNCTIONS_FILE_PATH"
|
||||
color
|
||||
verb_ip6
|
||||
catch_errors
|
||||
setting_up_container
|
||||
network_check
|
||||
update_os
|
||||
|
||||
msg_info "Configuring Squid"
|
||||
mkdir -p /etc/squid
|
||||
cat <<EOF >/etc/squid/squid.conf
|
||||
acl localnet src 0.0.0.1-0.255.255.255
|
||||
acl localnet src 10.0.0.0/8
|
||||
acl localnet src 100.64.0.0/10
|
||||
acl localnet src 169.254.0.0/16
|
||||
acl localnet src 172.16.0.0/12
|
||||
acl localnet src 192.168.0.0/16
|
||||
acl localnet src fc00::/7
|
||||
acl localnet src fe80::/10
|
||||
|
||||
acl SSL_ports port 443
|
||||
acl Safe_ports port 80
|
||||
acl Safe_ports port 21
|
||||
acl Safe_ports port 443
|
||||
acl Safe_ports port 70
|
||||
acl Safe_ports port 210
|
||||
acl Safe_ports port 1025-65535
|
||||
acl Safe_ports port 280
|
||||
acl Safe_ports port 488
|
||||
acl Safe_ports port 591
|
||||
acl Safe_ports port 777
|
||||
acl CONNECT method CONNECT
|
||||
|
||||
http_access deny !Safe_ports
|
||||
http_access deny CONNECT !SSL_ports
|
||||
http_access allow localhost manager
|
||||
http_access deny manager
|
||||
|
||||
auth_param basic program /usr/lib/squid/basic_ncsa_auth /etc/squid/passwords
|
||||
auth_param basic realm proxy
|
||||
acl authenticated proxy_auth REQUIRED
|
||||
http_access allow authenticated
|
||||
http_access deny all
|
||||
|
||||
http_port 3128
|
||||
|
||||
coredump_dir /var/spool/squid
|
||||
|
||||
refresh_pattern ^ftp: 1440 20% 10080
|
||||
refresh_pattern ^gopher: 1440 0% 1440
|
||||
refresh_pattern -i (/cgi-bin/|\\?) 0 0% 0
|
||||
refresh_pattern . 0 20% 4320
|
||||
|
||||
# Privacy / hardening
|
||||
httpd_suppress_version_string on
|
||||
visible_hostname $(hostname)
|
||||
forwarded_for delete
|
||||
request_header_access X-Forwarded-For deny all
|
||||
EOF
|
||||
msg_ok "Configured Squid"
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt install -y \
|
||||
squid \
|
||||
apache2-utils
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
msg_info "Configuring Squid Authentication"
|
||||
touch /etc/squid/passwords
|
||||
chown proxy:proxy /etc/squid/passwords
|
||||
chmod 640 /etc/squid/passwords
|
||||
$STD squid -k parse
|
||||
msg_ok "Configured Squid Authentication"
|
||||
|
||||
msg_info "Starting Service"
|
||||
systemctl enable -q --now squid
|
||||
msg_ok "Started Service"
|
||||
|
||||
motd_ssh
|
||||
customize
|
||||
cleanup_lxc
|
||||
+48
-70
@@ -4454,9 +4454,7 @@ setup_composer() {
|
||||
# - Uses stable distro packages by default
|
||||
# - Migrates from get.docker.com to repository-based installation
|
||||
# - Updates Docker Engine if newer version available
|
||||
# - Interactive per-container update prompt (Y/N, 60 s auto-no)
|
||||
# - Compose-managed containers: full restart via docker compose
|
||||
# - Standalone containers: image pull only, no destructive stop/rm
|
||||
# - Interactive container update with multi-select
|
||||
# - Portainer installation and update support
|
||||
# - Set DOCKER_NONINTERACTIVE=1 to skip interactive prompts (CI/unattended)
|
||||
# ------------------------------------------------------------------------------
|
||||
@@ -4643,83 +4641,63 @@ EOF
|
||||
fi
|
||||
fi
|
||||
|
||||
# Container Update Check
|
||||
# - Skipped entirely when running unattended / non-interactive
|
||||
# - Compose-managed containers: offered via Y/N → docker compose pull + up -d
|
||||
# - Standalone containers: offered via Y/N → image pull only (no stop/rm)
|
||||
if [ "$docker_installed" = true ] && ! _docker_is_noninteractive; then
|
||||
# Interactive Container Update Check
|
||||
if [[ "${DOCKER_SKIP_UPDATES:-}" != "true" ]] && [ "$docker_installed" = true ] && ! _docker_is_noninteractive; then
|
||||
msg_info "Checking for container updates"
|
||||
|
||||
local name image compose_workdir compose_service current_digest latest_digest
|
||||
local compose_updates=()
|
||||
local standalone_updates=()
|
||||
# Get list of running containers with update status
|
||||
local containers_with_updates=()
|
||||
local container_info=()
|
||||
local index=1
|
||||
|
||||
while IFS= read -r line; do
|
||||
name=$(echo "$line" | awk '{print $1}')
|
||||
image=$(echo "$line" | awk '{print $2}')
|
||||
while IFS= read -r container; do
|
||||
local name=$(echo "$container" | awk '{print $1}')
|
||||
local image=$(echo "$container" | awk '{print $2}')
|
||||
local current_digest=$(docker inspect "$name" --format='{{.Image}}' 2>/dev/null | cut -d':' -f2 | cut -c1-12)
|
||||
|
||||
# Portainer containers are handled by the dedicated block above
|
||||
[[ "$name" == "portainer" || "$name" == "portainer_agent" ]] && continue
|
||||
# Pull latest image digest (ignore failures, e.g. local-only images or registry/permission issues)
|
||||
docker pull "$image" >/dev/null 2>&1 || true
|
||||
local latest_digest=$(docker inspect "$image" --format='{{.Id}}' 2>/dev/null | cut -d':' -f2 | cut -c1-12)
|
||||
|
||||
current_digest=$(docker inspect "$name" --format='{{.Image}}' 2>/dev/null | cut -d':' -f2 | cut -c1-12)
|
||||
docker pull "$image" >/dev/null 2>&1 || continue
|
||||
latest_digest=$(docker inspect "$image" --format='{{.Id}}' 2>/dev/null | cut -d':' -f2 | cut -c1-12)
|
||||
[[ -z "$latest_digest" || "$current_digest" == "$latest_digest" ]] && continue
|
||||
|
||||
compose_workdir=$(docker inspect "$name" \
|
||||
--format='{{index .Config.Labels "com.docker.compose.project.working_dir"}}' 2>/dev/null || true)
|
||||
compose_service=$(docker inspect "$name" \
|
||||
--format='{{index .Config.Labels "com.docker.compose.service"}}' 2>/dev/null || true)
|
||||
|
||||
if [[ -n "$compose_workdir" && -n "$compose_service" && -d "$compose_workdir" ]]; then
|
||||
compose_updates+=("${name}|${image}|${compose_workdir}|${compose_service}")
|
||||
else
|
||||
standalone_updates+=("${name}|${image}")
|
||||
if [ -n "$latest_digest" ] && [ "$current_digest" != "$latest_digest" ]; then
|
||||
containers_with_updates+=("$name")
|
||||
container_info+=("${index}) ${name} (${image})")
|
||||
((index++))
|
||||
fi
|
||||
done < <(docker ps --format '{{.Names}} {{.Image}}')
|
||||
|
||||
# Stop spinner before any interactive prompt
|
||||
stop_spinner
|
||||
if [ ${#containers_with_updates[@]} -gt 0 ]; then
|
||||
echo ""
|
||||
echo "${TAB3}Container updates available:"
|
||||
for info in "${container_info[@]}"; do
|
||||
echo "${TAB3} $info"
|
||||
done
|
||||
echo ""
|
||||
read -r -p "${TAB3}Select containers to update (e.g., 1,3,5 or 'all' or 'none'): " selection
|
||||
|
||||
if [[ ${#compose_updates[@]} -eq 0 && ${#standalone_updates[@]} -eq 0 ]]; then
|
||||
msg_ok "All containers are up-to-date"
|
||||
if [[ ${selection,,} == "all" ]]; then
|
||||
for container in "${containers_with_updates[@]}"; do
|
||||
msg_info "Updating container: $container"
|
||||
docker stop "$container"
|
||||
docker rm "$container"
|
||||
# Note: This requires the original docker run command - best to recreate via compose
|
||||
msg_ok "Stopped and removed $container (please recreate with updated image)"
|
||||
done
|
||||
elif [[ ${selection,,} != "none" ]]; then
|
||||
IFS=',' read -ra SELECTED <<<"$selection"
|
||||
for num in "${SELECTED[@]}"; do
|
||||
num=$(echo "$num" | xargs) # trim whitespace
|
||||
if [[ "$num" =~ ^[0-9]+$ ]] && [ "$num" -ge 1 ] && [ "$num" -le "${#containers_with_updates[@]}" ]; then
|
||||
container="${containers_with_updates[$((num - 1))]}"
|
||||
msg_info "Updating container: $container"
|
||||
docker stop "$container"
|
||||
docker rm "$container"
|
||||
msg_ok "Stopped and removed $container (please recreate with updated image)"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
else
|
||||
local reply
|
||||
for entry in "${compose_updates[@]}"; do
|
||||
IFS='|' read -r name image compose_workdir compose_service <<<"$entry"
|
||||
reply=""
|
||||
if read -r -t 60 -p "${TAB3}Update ${name} (${image}) via Compose? <y/N> (auto-no in 60s): " reply; then
|
||||
echo ""
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
if [[ "${reply,,}" =~ ^(y|yes)$ ]]; then
|
||||
msg_info "Updating $name"
|
||||
if (cd "$compose_workdir" && $STD docker compose pull "$compose_service" && $STD docker compose up -d "$compose_service"); then
|
||||
msg_ok "Updated $name"
|
||||
else
|
||||
msg_warn "Could not update $name — try manually in $compose_workdir"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
for entry in "${standalone_updates[@]}"; do
|
||||
IFS='|' read -r name image <<<"$entry"
|
||||
reply=""
|
||||
if read -r -t 60 -p "${TAB3}Pull new image for ${name} (${image})? <y/N> (auto-no in 60s): " reply; then
|
||||
echo ""
|
||||
else
|
||||
echo ""
|
||||
fi
|
||||
if [[ "${reply,,}" =~ ^(y|yes)$ ]]; then
|
||||
msg_info "Pulling new image for $name"
|
||||
if $STD docker pull "$image"; then
|
||||
msg_ok "New image available for $name — recreate the container to apply the update"
|
||||
else
|
||||
msg_warn "Failed to pull image for $name"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
msg_ok "All containers are up-to-date"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
+4
-11
@@ -620,19 +620,12 @@ pve_check() {
|
||||
}
|
||||
|
||||
arch_check() {
|
||||
local arch
|
||||
arch="$(dpkg --print-architecture)"
|
||||
if [[ "$arch" != "amd64" && "$arch" != "arm64" ]]; then
|
||||
msg_error "This script requires amd64 or arm64."
|
||||
if [ "$(dpkg --print-architecture)" != "amd64" ]; then
|
||||
echo -e "\n ${INFO}${YWB}This script will not work with PiMox! \n"
|
||||
echo -e "\n ${YWB}Visit https://github.com/asylumexp/Proxmox for ARM64 support. \n"
|
||||
echo -e "Exiting..."
|
||||
sleep 2
|
||||
exit 106
|
||||
fi
|
||||
if [[ "$arch" == "arm64" && "${var_arm64:-}" != "yes" ]]; then
|
||||
echo -e "\n ${INFO}${YWB}This script does not yet support ARM64! \n"
|
||||
echo -e "Exiting..."
|
||||
sleep 2
|
||||
exit 106
|
||||
exit
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
+7
-26
@@ -11,6 +11,7 @@
|
||||
source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/misc/api.func) 2>/dev/null
|
||||
source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/misc/vm-core.func) 2>/dev/null
|
||||
source <(curl -fsSL https://git.community-scripts.org/community-scripts/ProxmoxVE/raw/branch/main/misc/cloud-init.func) 2>/dev/null || true
|
||||
load_functions
|
||||
|
||||
# ==============================================================================
|
||||
# SCRIPT VARIABLES
|
||||
@@ -20,7 +21,6 @@ APP_TYPE="vm"
|
||||
NSAPP="docker-vm"
|
||||
var_os="debian"
|
||||
var_version="13"
|
||||
ARCH=$(dpkg --print-architecture)
|
||||
|
||||
GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
|
||||
RANDOM_UUID="$(cat /proc/sys/kernel/random/uuid)"
|
||||
@@ -30,9 +30,6 @@ USE_CLOUD_INIT="no"
|
||||
OS_TYPE=""
|
||||
OS_VERSION=""
|
||||
THIN="discard=on,ssd=1,"
|
||||
var_arm64="yes"
|
||||
|
||||
load_functions
|
||||
|
||||
# ==============================================================================
|
||||
# ERROR HANDLING & CLEANUP
|
||||
@@ -139,16 +136,11 @@ function default_settings() {
|
||||
|
||||
VMID=$(get_valid_nextid)
|
||||
FORMAT=""
|
||||
if [ "$ARCH" = "arm64" ]; then
|
||||
MACHINE=""
|
||||
CPU_TYPE=""
|
||||
else
|
||||
MACHINE=" -machine q35"
|
||||
CPU_TYPE=" -cpu host"
|
||||
fi
|
||||
MACHINE=" -machine q35"
|
||||
DISK_CACHE=""
|
||||
DISK_SIZE="10G"
|
||||
HN="docker"
|
||||
CPU_TYPE=" -cpu host"
|
||||
CORE_COUNT="2"
|
||||
RAM_SIZE="4096"
|
||||
BRG="vmbr0"
|
||||
@@ -159,15 +151,11 @@ function default_settings() {
|
||||
METHOD="default"
|
||||
|
||||
echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}"
|
||||
if [ "$ARCH" = "arm64" ]; then
|
||||
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}virt (ARM64)${CL}"
|
||||
else
|
||||
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
|
||||
fi
|
||||
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}Q35 (Modern)${CL}"
|
||||
echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}"
|
||||
echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}None${CL}"
|
||||
echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}${HN}${CL}"
|
||||
echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}$([ "$ARCH" = "arm64" ] && echo "Default" || echo "Host")${CL}"
|
||||
echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}"
|
||||
echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}"
|
||||
echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}${CL}"
|
||||
echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}${BRG}${CL}"
|
||||
@@ -209,11 +197,7 @@ function advanced_settings() {
|
||||
done
|
||||
|
||||
# Machine Type
|
||||
if [ "$ARCH" = "arm64" ]; then
|
||||
FORMAT=""
|
||||
MACHINE=""
|
||||
echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}virt${CL}"
|
||||
elif MACH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
|
||||
if MACH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \
|
||||
"q35" "Q35 (Modern, PCIe)" ON \
|
||||
"i440fx" "i440fx (Legacy, PCI)" OFF \
|
||||
3>&1 1>&2 2>&3); then
|
||||
@@ -278,10 +262,7 @@ function advanced_settings() {
|
||||
fi
|
||||
|
||||
# CPU Model
|
||||
if [ "$ARCH" = "arm64" ]; then
|
||||
CPU_TYPE=""
|
||||
echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Default${CL}"
|
||||
elif CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \
|
||||
if CPU_TYPE1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "CPU MODEL" --radiolist "Choose" --cancel-button Exit-Script 10 58 2 \
|
||||
"1" "Host (Recommended)" ON \
|
||||
"0" "KVM64" OFF \
|
||||
3>&1 1>&2 2>&3); then
|
||||
|
||||
Reference in New Issue
Block a user