Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions images/proxmox-ve/create-manager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ CTID="${CTID:-100}"
BRIDGE="${BRIDGE:-vmbr0}"
MANAGER_TAG="${MANAGER_TAG:-latest}"

# Leave the Manager CT unpinned by default. In nested Docker/WSL2,
# forcing a cores value can cause LXC to generate an invalid empty
# lxc.cgroup.cpuset.cpus line. Set MANAGER_CORES=4 to opt in.
MANAGER_CORES="${MANAGER_CORES:-}"
MANAGER_CORE_ARGS=()

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need to support "MANAGER_CORE_ARGS". I'm fine with no CPU pinning by default for manager.


if [ -n "$MANAGER_CORES" ]; then
MANAGER_CORE_ARGS+=(--cores="${MANAGER_CORES}")
fi

# Wait for pve-cluster.service to mount the Proxmox cluster filesystem
until [ -d /etc/pve/local ]; do
sleep 0.5
Expand Down Expand Up @@ -32,7 +42,7 @@ fi
# `container-creator-init.service` attempting to bootstrap the database before
# we're ready for it.
pct create 100 "local:vztmpl/manager_${MANAGER_TAG}.tar" \
--cores=4 \
"${MANAGER_CORE_ARGS[@]}" \
--features=nesting=1 \
--hostname=manager \
--memory=8192 \
Expand Down Expand Up @@ -69,8 +79,11 @@ pct push 100 \
# sorts of AppArmor and userns problems due to the nested Proxmox-in-Docker.
pct shutdown 100
pct set 100 \
--mp0=/opt/opensource-server,mp=/opt/opensource-server \
--entrypoint=/sbin/init
--mp0=/opt/opensource-server,mp=/opt/opensource-server

# Remove the temporary emergency entrypoint before the final start so the
# Manager CT boots to the default target with networking and services enabled.
pct set 100 --delete entrypoint || true

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the entrypoint fails to delete we need to assume the container is in a bad state and not start it. Let this fail rather than swallowing the error with || true.


# Finally we start the container back up completing this service run.
pct start 100