From 4a1c11d4edf4207b27db2bfc63d861e1e5fc5019 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Mon, 20 Dec 2021 21:19:47 +0000 Subject: [PATCH 1/3] Fix deploy script --- ci/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index 6053424..617755b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -42,7 +42,7 @@ then 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 From de63bdf96a980b1edb57f603458d360f102334b9 Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Fri, 31 Dec 2021 18:09:10 +0100 Subject: [PATCH 2/3] Change url main repo --- ci/deploy.sh | 1 - lib/core/common.sh | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/deploy.sh b/ci/deploy.sh index 617755b..d953f04 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -35,7 +35,6 @@ 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') diff --git a/lib/core/common.sh b/lib/core/common.sh index ad2b0f7..7618af5 100644 --- a/lib/core/common.sh +++ b/lib/core/common.sh @@ -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' From 6efc4d0f528cdbbf52cac44e1e9e45f6bf310d5d Mon Sep 17 00:00:00 2001 From: Filippo Squillace Date: Fri, 31 Dec 2021 18:20:27 +0100 Subject: [PATCH 3/3] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6fddc82..de0fc6a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.3.10 +7.3.11