Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rest of build func #1301

Merged
merged 5 commits into from
Jan 9, 2025
Merged

Update rest of build func #1301

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d661b27
Redo: Change from wget to curl when fetching create_lxc.sh
cricalix Jan 6, 2025
4ca6da2
Redo: [overrideable url] Initial changes to ct scripts to use environ…
cricalix Jan 6, 2025
ad9b914
Redo: [overrideable url] Remaining changes to ct scripts to use envir…
cricalix Jan 6, 2025
46b66e1
Redo: [overrideable url] Update build.func to use overrideable URL
cricalix Jan 6, 2025
7438f12
Merge branch 'dev_overrideable_url' into update-rest-of-build-func
michelroegl-brunner Jan 9, 2025
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
9 changes: 5 additions & 4 deletions misc/build.func
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,9 +788,9 @@ build_container() {
TEMP_DIR=$(mktemp -d)
pushd $TEMP_DIR >/dev/null
if [ "$var_os" == "alpine" ]; then
export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/alpine-install.func)"
export FUNCTIONS_FILE_PATH="$(curl -s ${CSCRIPTS_BASE_URL}/misc/alpine-install.func)"
else
export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/install.func)"
export FUNCTIONS_FILE_PATH="$(curl -s ${CSCRIPTS_BASE_URL}/misc/install.func)"
fi
export CACHER="$APT_CACHER"
export CACHER_IP="$APT_CACHER_IP"
Expand Down Expand Up @@ -820,7 +820,8 @@ build_container() {
$PW
"
# This executes create_lxc.sh and creates the container and .conf file
bash -c "$(curl -sL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/ct/create_lxc.sh)" || exit

bash -c "$(curl -sL ${CSCRIPTS_BASE_URL}/ct/create_lxc.sh)" || exit

LXC_CONFIG=/etc/pve/lxc/${CTID}.conf
if [ "$CT_TYPE" == "0" ]; then
Expand Down Expand Up @@ -882,7 +883,7 @@ http://dl-cdn.alpinelinux.org/alpine/latest-stable/community
EOF'
pct exec "$CTID" -- ash -c "apk add bash >/dev/null"
fi
lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/$var_install.sh)" || exit
lxc-attach -n "$CTID" -- bash -c "$(wget -qLO - ${CSCRIPTS_BASE_URL}/install/$var_install.sh)" || exit

}

Expand Down
Loading