github-personal/ack-image-builder
1
0
Fork 0
mirror of https://github.com/outbackdingo/ack-image-builder.git synced 2026-01-27 10:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #42 from wzx0z/fix-pkg-name

Browse Source 
Fix package not found issue
This commit is contained in:
Bingshen Wang
2023-09-26 16:59:10 +08:00
committed by GitHub
parent 20ed2a9e37 391e4590db
commit 36ffb7fc3f
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/ack-optimized-os-linux3-all.sh
View File

@@ -47,6 +47,8 @@ setup_env() {
export RUNTIME_VERSION="1.5.10"
fi
export RELEASE_VERSION=$(echo $KUBE_VERSION | awk -F. '{print $1"."$2}')
export REGION=$(curl --retry 10 -sSL http://100.100.100.200/latest/meta-data/region-id)
export PKG_FILE_SERVER="http://aliacs-k8s-$REGION.oss-$REGION-internal.aliyuncs.com/$BETA_VERSION"
export ACK_OPTIMIZED_OS_BUILD=1
@@ -54,17 +56,17 @@ setup_env() {
download_pkg() {
curl --retry 4 $PKG_FILE_SERVER/public/pkg/run/run-${KUBE_VERSION}.tar.gz -O
tar -xvf run-${KUBE_VERSION}.tar.gz
curl --retry 4 $PKG_FILE_SERVER/public/pkg/run/run-${RELEASE_VERSION}-linux-${OS_ARCH}.tar.gz -O
tar -xvf run-${RELEASE_VERSION}-linux-${OS_ARCH}.tar.gz
}
source_file() {
if [[ -e "pkg/run/$KUBE_VERSION/kubernetes.sh" ]]; then
source pkg/run/$KUBE_VERSION/kubernetes.sh --role source
if [[ -e "pkg/run/$RELEASE_VERSION/kubernetes.sh" ]]; then
source pkg/run/$RELEASE_VERSION/kubernetes.sh --role source
install_pkg
elif [[ -e "pkg/run/$KUBE_VERSION/bin/kubernetes.sh" ]]; then
ROLE=deploy-nodes pkg/run/$KUBE_VERSION/bin/kubernetes.sh
elif [[ -e "pkg/run/$RELEASE_VERSION/bin/kubernetes.sh" ]]; then
ROLE=deploy-nodes pkg/run/$RELEASE_VERSION/bin/kubernetes.sh
fi
}
@@ -76,7 +78,7 @@ install_pkg() {
preset_gpu() {
GPU_PACKAGE_URL=http://aliacs-k8s-${REGION}.oss-${REGION}-internal.aliyuncs.com/public/pkg
if [[ "$PRESET_GPU" == "true" ]]; then
bash -x pkg/run/$KUBE_VERSION/bin/nvidia-gpu-installer.sh --package-url-prefix ${GPU_PACKAGE_URL}
bash -x pkg/run/$RELEASE_VERSION/bin/nvidia-gpu-installer.sh --package-url-prefix ${GPU_PACKAGE_URL}
fi
}
@@ -239,4 +241,4 @@ main() {
record_k8s_version
}
main "$@"
main "$@"