Merge branch 'dev' into master

This commit is contained in:
Filippo Squillace 2021-12-31 18:20:55 +01:00 committed by Filippo Squillace
commit e6bae0647c
3 changed files with 3 additions and 4 deletions

View file

@ -1 +1 @@
7.3.10
7.3.11

View file

@ -35,14 +35,13 @@ then
cp ${IMG_PATH} ${IMG_PATH}.temp
aws s3 cp ${IMG_PATH}.temp s3://junest-repo/junest/
aws s3 mv s3://junest-repo/junest/$img_name.temp s3://junest-repo/junest/$img_name
aws s3api put-object-acl --acl public-read --bucket junest-repo --key junest/$img_name
DATE=$(date +'%Y-%m-%d-%H-%M-%S')
aws s3 cp s3://junest-repo/junest/$img_name s3://junest-repo/junest/${img_name}.${DATE}
# Cleanup old images
aws s3 ls s3://junest-repo/junest/junest-${ARCH}.tar.gz. | awk '{print $4}' | head -n -${MAX_OLD_IMAGES} | xargs -I {} s3 rm "s3://junest-repo/junest/{}"
aws s3 ls s3://junest-repo/junest/junest-${ARCH}.tar.gz. | awk '{print $4}' | head -n -${MAX_OLD_IMAGES} | xargs -I {} aws s3 rm "s3://junest-repo/junest/{}"
# Test the newly deployed image can be downloaded correctly
junest setup

View file

@ -51,7 +51,7 @@ else
die "Unknown architecture ${HOST_ARCH}"
fi
MAIN_REPO=https://s3-eu-west-1.amazonaws.com/${CMD}-repo
MAIN_REPO=https://dwa8bhj1f036z.cloudfront.net
ENV_REPO=${MAIN_REPO}/${CMD}
DEFAULT_MIRROR='https://mirror.rackspace.com/archlinux/$repo/os/$arch'