mirror of
https://github.com/community-scripts/ProxmoxVE.git
synced 2026-08-09 22:29:14 +02:00
Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 970bf64fee | |||
| 3ed946390f | |||
| 4626ec8845 | |||
| 579c1b6b26 | |||
| 5264fc5897 | |||
| 6063f0747d | |||
| 5374826753 | |||
| b32071de43 | |||
| af10e10f20 | |||
| ad09299de7 | |||
| 5f71caac5b | |||
| 87db412709 | |||
| 83ad1c972d | |||
| d11d3156db | |||
| 773b46c969 |
@@ -523,6 +523,27 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
|
||||
|
||||
## 2026-08-09
|
||||
|
||||
### 🚀 Updated Scripts
|
||||
|
||||
- #### 🐞 Bug Fixes
|
||||
|
||||
- Fix: CouchDB Erlang cookie breaks vm.args (use hex) [@fudianchn](https://github.com/fudianchn) ([#16361](https://github.com/community-scripts/ProxmoxVE/pull/16361))
|
||||
- SparkyFitness: Install Git for frontend builds [@MickLesk](https://github.com/MickLesk) ([#16352](https://github.com/community-scripts/ProxmoxVE/pull/16352))
|
||||
- Byparr: Use invisible-playwright browser setup [@MickLesk](https://github.com/MickLesk) ([#16353](https://github.com/community-scripts/ProxmoxVE/pull/16353))
|
||||
- Crafty Controller: Restore ownership after updates [@MickLesk](https://github.com/MickLesk) ([#16354](https://github.com/community-scripts/ProxmoxVE/pull/16354))
|
||||
- Webtrees: Fix schema check in silent mode [@MickLesk](https://github.com/MickLesk) ([#16355](https://github.com/community-scripts/ProxmoxVE/pull/16355))
|
||||
- SigNoz: Allow legacy metadata schema on ClickHouse 26 [@MickLesk](https://github.com/MickLesk) ([#16356](https://github.com/community-scripts/ProxmoxVE/pull/16356))
|
||||
|
||||
### 🧰 Tools
|
||||
|
||||
- #### ✨ New Features
|
||||
|
||||
- Portainer: Update existing CE and BE installations [@MickLesk](https://github.com/MickLesk) ([#16357](https://github.com/community-scripts/ProxmoxVE/pull/16357))
|
||||
|
||||
### 📚 Documentation
|
||||
|
||||
- github: update Star History links and image sources [@MickLesk](https://github.com/MickLesk) ([#16367](https://github.com/community-scripts/ProxmoxVE/pull/16367))
|
||||
|
||||
## 2026-08-08
|
||||
|
||||
### 🆕 New Scripts
|
||||
|
||||
@@ -171,11 +171,21 @@ This project runs on community contributions. Whether you want to write new scri
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://star-history.com/#community-scripts/ProxmoxVE&Date">
|
||||
<a href="https://www.star-history.com/?repos=community-scripts%2FProxmoxVE&type=date&legend=top-left">
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=community-scripts/ProxmoxVE&type=Date&theme=dark" />
|
||||
<source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=community-scripts/ProxmoxVE&type=Date" />
|
||||
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=community-scripts/ProxmoxVE&type=Date" width="700" />
|
||||
<source
|
||||
media="(prefers-color-scheme: dark)"
|
||||
srcset="https://api.star-history.com/chart?repos=community-scripts/ProxmoxVE&type=date&theme=dark&legend=top-left&sealed_token=-lUy2KH6pJryUyLCbiWRwFz3ilXMDFVFHm0lJcqh-Hl5e0QNNKjINNcXzULhaZVpBugN_TDaxOawEAuzwBc5Sjqa2mCRw9K6TdCioKRDsS_qXUwhkLQSCMRSg1schCdl4rQD8qEj7PWBjin-fyHnDm7NnM6akZp59jndG7qV7PrvG8nLBgDIuuA-wAI3"
|
||||
/>
|
||||
<source
|
||||
media="(prefers-color-scheme: light)"
|
||||
srcset="https://api.star-history.com/chart?repos=community-scripts/ProxmoxVE&type=date&legend=top-left&sealed_token=-lUy2KH6pJryUyLCbiWRwFz3ilXMDFVFHm0lJcqh-Hl5e0QNNKjINNcXzULhaZVpBugN_TDaxOawEAuzwBc5Sjqa2mCRw9K6TdCioKRDsS_qXUwhkLQSCMRSg1schCdl4rQD8qEj7PWBjin-fyHnDm7NnM6akZp59jndG7qV7PrvG8nLBgDIuuA-wAI3"
|
||||
/>
|
||||
<img
|
||||
alt="Star History Chart"
|
||||
src="https://api.star-history.com/chart?repos=community-scripts/ProxmoxVE&type=date&legend=top-left&sealed_token=-lUy2KH6pJryUyLCbiWRwFz3ilXMDFVFHm0lJcqh-Hl5e0QNNKjINNcXzULhaZVpBugN_TDaxOawEAuzwBc5Sjqa2mCRw9K6TdCioKRDsS_qXUwhkLQSCMRSg1schCdl4rQD8qEj7PWBjin-fyHnDm7NnM6akZp59jndG7qV7PrvG8nLBgDIuuA-wAI3"
|
||||
width="700"
|
||||
/>
|
||||
</picture>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
+1
-1
@@ -81,7 +81,7 @@ function update_script() {
|
||||
msg_info "Configuring Byparr"
|
||||
cd /opt/Byparr
|
||||
$STD uv sync --link-mode copy
|
||||
$STD uv run camoufox fetch
|
||||
$STD uv run python -m invisible_playwright fetch
|
||||
msg_ok "Configured Byparr"
|
||||
|
||||
msg_info "Starting Service"
|
||||
|
||||
@@ -44,6 +44,7 @@ function update_script() {
|
||||
|
||||
CLEAN_INSTALL=1 fetch_and_deploy_gl_release "Crafty-Controller" "crafty-controller/crafty-4" "tarball" "latest" "/opt/crafty-controller/crafty/crafty-4"
|
||||
|
||||
chown -R crafty:crafty /opt/crafty-controller
|
||||
restore_backup
|
||||
|
||||
msg_info "Updating TemurinJDK"
|
||||
@@ -53,7 +54,6 @@ function update_script() {
|
||||
msg_ok "Updated TemurinJDK"
|
||||
|
||||
msg_info "Updating Python dependencies"
|
||||
chown -R crafty:crafty /opt/crafty-controller
|
||||
cd /opt/crafty-controller/crafty/crafty-4
|
||||
$STD sudo -u crafty bash -c '
|
||||
source /opt/crafty-controller/crafty/.venv/bin/activate
|
||||
|
||||
@@ -30,6 +30,7 @@ function update_script() {
|
||||
exit
|
||||
fi
|
||||
|
||||
ensure_dependencies git
|
||||
if check_for_gh_release "sparkyfitness" "CodeWithCJ/SparkyFitness"; then
|
||||
msg_info "Stopping Services"
|
||||
systemctl stop sparkyfitness-server nginx
|
||||
|
||||
@@ -14,7 +14,7 @@ network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Apache CouchDB"
|
||||
ERLANG_COOKIE=$(openssl rand -base64 32)
|
||||
ERLANG_COOKIE=$(openssl rand -hex 32)
|
||||
ADMIN_PASS="$(openssl rand -base64 18 | cut -c1-13)"
|
||||
debconf-set-selections <<<"couchdb couchdb/cookie string $ERLANG_COOKIE"
|
||||
debconf-set-selections <<<"couchdb couchdb/mode select standalone"
|
||||
|
||||
@@ -58,7 +58,7 @@ fetch_and_deploy_gh_release "Byparr" "ThePhaseless/Byparr" "tarball" "latest"
|
||||
msg_info "Configuring Byparr"
|
||||
cd /opt/Byparr
|
||||
$STD uv sync --link-mode copy
|
||||
$STD uv run camoufox fetch
|
||||
$STD uv run python -m invisible_playwright fetch
|
||||
msg_ok "Configured Byparr"
|
||||
|
||||
msg_info "Creating Service"
|
||||
|
||||
@@ -103,6 +103,9 @@ cat <<EOF >/etc/clickhouse-server/config.d/cluster.xml
|
||||
<shard>01</shard>
|
||||
<replica>01</replica>
|
||||
</macros>
|
||||
<merge_tree>
|
||||
<allow_dimensions_outside_sorting_key>1</allow_dimensions_outside_sorting_key>
|
||||
</merge_tree>
|
||||
</clickhouse>
|
||||
EOF
|
||||
systemctl enable -q --now clickhouse-server
|
||||
|
||||
@@ -14,7 +14,7 @@ network_check
|
||||
update_os
|
||||
|
||||
msg_info "Installing Dependencies"
|
||||
$STD apt install -y nginx
|
||||
$STD apt install -y git nginx
|
||||
msg_ok "Installed Dependencies"
|
||||
|
||||
PG_VERSION="18" setup_postgresql
|
||||
|
||||
@@ -66,7 +66,7 @@ for i in {1..15}; do
|
||||
fi
|
||||
sleep 2
|
||||
done
|
||||
$STD mariadb -u webtrees -p"${MARIADB_DB_PASS}" -h 127.0.0.1 webtrees -e "SHOW TABLES LIKE 'wt_user';" | grep -q wt_user
|
||||
mariadb -u webtrees -p"${MARIADB_DB_PASS}" -h 127.0.0.1 webtrees -e "SHOW TABLES LIKE 'wt_user';" | grep -q wt_user
|
||||
msg_ok "Initialized Webtrees database schema"
|
||||
$STD sudo -u www-data php /opt/webtrees/index.php user Admin \
|
||||
--create \
|
||||
|
||||
+175
-28
@@ -27,6 +27,10 @@ APP_TYPE="addon"
|
||||
INSTALL_PATH="/opt/portainer"
|
||||
COMPOSE_FILE="${INSTALL_PATH}/compose.yaml"
|
||||
DEFAULT_PORT=9443
|
||||
PORTAINER_IMAGE=""
|
||||
COMPOSE_WORKDIR=""
|
||||
COMPOSE_SERVICE=""
|
||||
COMPOSE_CONFIG_FILES=""
|
||||
|
||||
# Initialize all core functions (colors, formatting, icons, STD mode)
|
||||
load_functions
|
||||
@@ -66,17 +70,166 @@ UPDATEEOF
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# UPDATE
|
||||
# DETECT EXISTING INSTALLATION
|
||||
# ==============================================================================
|
||||
function update() {
|
||||
function detect_portainer() {
|
||||
PORTAINER_IMAGE=""
|
||||
COMPOSE_WORKDIR=""
|
||||
COMPOSE_SERVICE=""
|
||||
COMPOSE_CONFIG_FILES=""
|
||||
|
||||
if ! docker container inspect portainer &>/dev/null; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
PORTAINER_IMAGE=$(docker inspect portainer --format '{{.Config.Image}}')
|
||||
if [[ ! "$PORTAINER_IMAGE" =~ (^|/)portainer-(ce|ee)(:|@) ]]; then
|
||||
msg_error "A container named 'portainer' exists but does not use an official Portainer CE or BE image."
|
||||
exit 10
|
||||
fi
|
||||
|
||||
COMPOSE_WORKDIR=$(docker inspect portainer --format '{{index .Config.Labels "com.docker.compose.project.working_dir"}}' 2>/dev/null || true)
|
||||
COMPOSE_SERVICE=$(docker inspect portainer --format '{{index .Config.Labels "com.docker.compose.service"}}' 2>/dev/null || true)
|
||||
COMPOSE_CONFIG_FILES=$(docker inspect portainer --format '{{index .Config.Labels "com.docker.compose.project.config_files"}}' 2>/dev/null || true)
|
||||
if [[ "$COMPOSE_WORKDIR" == "<no value>" ]]; then
|
||||
COMPOSE_WORKDIR=""
|
||||
fi
|
||||
if [[ "$COMPOSE_SERVICE" == "<no value>" ]]; then
|
||||
COMPOSE_SERVICE=""
|
||||
fi
|
||||
if [[ "$COMPOSE_CONFIG_FILES" == "<no value>" ]]; then
|
||||
COMPOSE_CONFIG_FILES=""
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# UPDATE COMPOSE INSTALLATION
|
||||
# ==============================================================================
|
||||
function update_compose() {
|
||||
local workdir="$1"
|
||||
local service="$2"
|
||||
local config_files="$3"
|
||||
local config
|
||||
local -a configs=()
|
||||
local -a compose_args=()
|
||||
|
||||
if [[ -n "$config_files" ]]; then
|
||||
IFS=',' read -ra configs <<<"$config_files"
|
||||
for config in "${configs[@]}"; do
|
||||
compose_args+=(--file "$config")
|
||||
done
|
||||
fi
|
||||
|
||||
msg_info "Pulling latest ${APP} image"
|
||||
cd "$INSTALL_PATH"
|
||||
$STD docker compose pull
|
||||
if [[ -n "$service" ]]; then
|
||||
(cd "$workdir" && $STD docker compose "${compose_args[@]}" pull "$service")
|
||||
else
|
||||
(cd "$workdir" && $STD docker compose pull)
|
||||
fi
|
||||
msg_ok "Pulled latest image"
|
||||
|
||||
msg_info "Restarting ${APP}"
|
||||
$STD docker compose up -d --remove-orphans
|
||||
if [[ -n "$service" ]]; then
|
||||
(cd "$workdir" && $STD docker compose "${compose_args[@]}" up -d "$service")
|
||||
else
|
||||
(cd "$workdir" && $STD docker compose up -d --remove-orphans)
|
||||
fi
|
||||
msg_ok "Restarted ${APP}"
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# UPDATE STANDALONE INSTALLATION
|
||||
# ==============================================================================
|
||||
function update_standalone() {
|
||||
local old_image_id latest_image_id restart_name restart_max network_mode container_port host_ip host_port source destination mode writable
|
||||
local was_running privileged user
|
||||
local -a run_args=(-d --name portainer)
|
||||
local -a command=()
|
||||
|
||||
old_image_id=$(docker inspect portainer --format '{{.Image}}')
|
||||
was_running=$(docker inspect portainer --format '{{.State.Running}}')
|
||||
restart_name=$(docker inspect portainer --format '{{.HostConfig.RestartPolicy.Name}}')
|
||||
restart_max=$(docker inspect portainer --format '{{.HostConfig.RestartPolicy.MaximumRetryCount}}')
|
||||
network_mode=$(docker inspect portainer --format '{{.HostConfig.NetworkMode}}')
|
||||
privileged=$(docker inspect portainer --format '{{.HostConfig.Privileged}}')
|
||||
user=$(docker inspect portainer --format '{{.Config.User}}')
|
||||
|
||||
if [[ -n "$restart_name" && "$restart_name" != "no" ]]; then
|
||||
if [[ "$restart_name" == "on-failure" && "$restart_max" -gt 0 ]]; then
|
||||
run_args+=(--restart "${restart_name}:${restart_max}")
|
||||
else
|
||||
run_args+=(--restart "$restart_name")
|
||||
fi
|
||||
fi
|
||||
[[ "$network_mode" != "default" ]] && run_args+=(--network "$network_mode")
|
||||
[[ "$privileged" == "true" ]] && run_args+=(--privileged)
|
||||
[[ -n "$user" ]] && run_args+=(--user "$user")
|
||||
|
||||
while IFS='|' read -r container_port host_ip host_port; do
|
||||
[[ -z "$container_port" || -z "$host_port" ]] && continue
|
||||
[[ "$host_ip" == *:* ]] && host_ip="[${host_ip}]"
|
||||
if [[ -n "$host_ip" && "$host_ip" != "0.0.0.0" ]]; then
|
||||
run_args+=(-p "${host_ip}:${host_port}:${container_port}")
|
||||
else
|
||||
run_args+=(-p "${host_port}:${container_port}")
|
||||
fi
|
||||
done < <(docker inspect portainer --format '{{range $port, $bindings := .HostConfig.PortBindings}}{{range $bindings}}{{printf "%s|%s|%s\n" $port .HostIp .HostPort}}{{end}}{{end}}')
|
||||
|
||||
while IFS='|' read -r source destination mode writable; do
|
||||
[[ -z "$source" || -z "$destination" ]] && continue
|
||||
if [[ "$writable" == "false" ]]; then
|
||||
mode="${mode:+${mode},}ro"
|
||||
fi
|
||||
run_args+=(-v "${source}:${destination}${mode:+:${mode}}")
|
||||
done < <(docker inspect portainer --format '{{range .Mounts}}{{if eq .Type "volume"}}{{.Name}}{{else}}{{.Source}}{{end}}|{{.Destination}}|{{.Mode}}|{{.RW}}{{println}}{{end}}')
|
||||
|
||||
while IFS= read -r environment; do
|
||||
[[ -n "$environment" ]] && run_args+=(-e "$environment")
|
||||
done < <(docker inspect portainer --format '{{range .Config.Env}}{{println .}}{{end}}')
|
||||
|
||||
while IFS= read -r argument; do
|
||||
[[ -n "$argument" ]] && command+=("$argument")
|
||||
done < <(docker inspect portainer --format '{{range .Config.Cmd}}{{println .}}{{end}}')
|
||||
|
||||
msg_info "Pulling latest ${APP} image"
|
||||
$STD docker pull "$PORTAINER_IMAGE"
|
||||
latest_image_id=$(docker image inspect "$PORTAINER_IMAGE" --format '{{.Id}}')
|
||||
msg_ok "Pulled latest image"
|
||||
|
||||
if [[ "$old_image_id" == "$latest_image_id" ]]; then
|
||||
msg_ok "${APP} is already up to date"
|
||||
return 0
|
||||
fi
|
||||
|
||||
msg_info "Recreating ${APP}"
|
||||
[[ "$was_running" == "true" ]] && $STD docker stop portainer
|
||||
$STD docker rm portainer
|
||||
if ! $STD docker run "${run_args[@]}" "$PORTAINER_IMAGE" "${command[@]}"; then
|
||||
msg_warn "Update failed, restoring the previous ${APP} image"
|
||||
docker rm -f portainer &>/dev/null || true
|
||||
if $STD docker run "${run_args[@]}" "$old_image_id" "${command[@]}"; then
|
||||
[[ "$was_running" != "true" ]] && $STD docker stop portainer
|
||||
msg_error "Failed to update ${APP}; restored the previous container."
|
||||
else
|
||||
msg_error "Failed to update or restore ${APP}."
|
||||
fi
|
||||
exit 10
|
||||
fi
|
||||
msg_ok "Recreated ${APP}"
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# UPDATE
|
||||
# ==============================================================================
|
||||
function update() {
|
||||
if [[ -f "$COMPOSE_FILE" ]]; then
|
||||
update_compose "$INSTALL_PATH" "" ""
|
||||
elif [[ -n "$COMPOSE_WORKDIR" && -n "$COMPOSE_SERVICE" && -d "$COMPOSE_WORKDIR" ]]; then
|
||||
update_compose "$COMPOSE_WORKDIR" "$COMPOSE_SERVICE" "$COMPOSE_CONFIG_FILES"
|
||||
else
|
||||
update_standalone
|
||||
fi
|
||||
|
||||
ensure_update_script
|
||||
|
||||
@@ -99,26 +252,16 @@ function check_docker() {
|
||||
msg_ok "Docker $(docker --version | cut -d' ' -f3 | tr -d ',') and Docker Compose are available"
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# CHECK EXISTING CONTAINER
|
||||
# ==============================================================================
|
||||
function check_existing_container() {
|
||||
# Guards against clobbering a Portainer container not managed by this addon
|
||||
# (e.g. Business/Enterprise Edition installed manually or via the legacy docker.sh flow)
|
||||
if docker ps -a --format '{{.Names}}' | grep -q '^portainer$'; then
|
||||
msg_error "A container named 'portainer' already exists but is not managed by this addon."
|
||||
msg_error "This may be a Portainer Business/Enterprise Edition install or a manual setup."
|
||||
msg_error "Remove/rename that container first, or manage it manually. Exiting."
|
||||
exit 10
|
||||
fi
|
||||
}
|
||||
|
||||
# ==============================================================================
|
||||
# INSTALL
|
||||
# ==============================================================================
|
||||
function install() {
|
||||
check_docker
|
||||
check_existing_container
|
||||
detect_portainer
|
||||
if [[ -n "$PORTAINER_IMAGE" ]]; then
|
||||
msg_error "${APP} is already installed."
|
||||
exit 10
|
||||
fi
|
||||
|
||||
msg_info "Creating install directory"
|
||||
mkdir -p "$INSTALL_PATH"
|
||||
@@ -148,7 +291,9 @@ function install() {
|
||||
# Handle type=update (called from update script)
|
||||
if [[ "${type:-}" == "update" ]]; then
|
||||
header_info
|
||||
if [[ -f "$COMPOSE_FILE" ]]; then
|
||||
check_docker
|
||||
detect_portainer
|
||||
if [[ -f "$COMPOSE_FILE" || -n "$PORTAINER_IMAGE" ]]; then
|
||||
update
|
||||
else
|
||||
msg_error "${APP} is not installed. Nothing to update."
|
||||
@@ -161,18 +306,20 @@ header_info
|
||||
get_lxc_ip
|
||||
|
||||
check_docker
|
||||
check_existing_container
|
||||
detect_portainer
|
||||
|
||||
# Check if already installed
|
||||
if [[ -f "$COMPOSE_FILE" ]]; then
|
||||
if [[ -f "$COMPOSE_FILE" || -n "$PORTAINER_IMAGE" ]]; then
|
||||
msg_warn "${APP} is already installed."
|
||||
echo ""
|
||||
|
||||
echo -n "${TAB}Uninstall ${APP}? (y/N): "
|
||||
read -r uninstall_prompt
|
||||
if [[ "${uninstall_prompt,,}" =~ ^(y|yes)$ ]]; then
|
||||
uninstall
|
||||
exit 0
|
||||
if [[ -f "$COMPOSE_FILE" ]]; then
|
||||
echo -n "${TAB}Uninstall ${APP}? (y/N): "
|
||||
read -r uninstall_prompt
|
||||
if [[ "${uninstall_prompt,,}" =~ ^(y|yes)$ ]]; then
|
||||
uninstall
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
echo -n "${TAB}Update ${APP}? (y/N): "
|
||||
|
||||
Reference in New Issue
Block a user