From 20071bd231f1bd1537072d9d623da6080ba17579 Mon Sep 17 00:00:00 2001 From: Duncan Hill Date: Thu, 9 Jan 2025 15:26:16 +0000 Subject: [PATCH] Update rest of build func (#1301) * Redo: Change from wget to curl when fetching create_lxc.sh * Redo: [overrideable url] Initial changes to ct scripts to use environment variable * Redo: [overrideable url] Remaining changes to ct scripts to use environment variable * Redo: [overrideable url] Update build.func to use overrideable URL --------- Co-authored-by: Michel Roegl-Brunner <73236783+michelroegl-brunner@users.noreply.github.com> --- misc/build.func | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/misc/build.func b/misc/build.func index 1ebc0cc2..e8c50f4e 100644 --- a/misc/build.func +++ b/misc/build.func @@ -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" @@ -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 @@ -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 }