pyrox.dev
Fixes for script that builds and uploads EC2 s3 backed images. Mostly credential related.
(cherry picked from commit 42c0bc4b8f7f4f5027392a842b787434fb12094f)
+9
-4
nixos/maintainers/scripts/ec2/create-s3-amis.sh
+9
-4
nixos/maintainers/scripts/ec2/create-s3-amis.sh
···
31
31
-a "$EC2_ACCESS_KEY" -s "$EC2_SECRET_KEY" --location "$s3location" \
32
32
--url http://s3.amazonaws.com
33
33
34
-
kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.03-$arch*" --region "$region" | cut -f 2)
34
+
kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.04-$arch*" --region "$region" | cut -f 2)
35
35
echo "using PV-GRUB kernel $kernel"
36
36
37
-
ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" \
37
+
ami=$(ec2-register "$bucket/nixos.img.manifest.xml" -n "$name" -d "NixOS $system r$revision" -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY" \
38
38
--region "$region" --kernel "$kernel" | cut -f 2)
39
39
40
40
echo "AMI ID is $ami"
41
41
42
-
echo $ami >> $region.s3.ami-id
42
+
echo " \"14.12\".\"$region\".s3 = \"$ami\";" >> ec2-amis.nix
43
+
44
+
ec2-modify-image-attribute --region "$region" "$ami" -l -a all -O "$EC2_ACCESS_KEY" -W "$EC2_SECRET_KEY"
43
45
44
-
ec2-modify-image-attribute --region "$region" "$ami" -l -a all
46
+
for cp_region in us-east-1 us-west-1 us-west-2 eu-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 sa-east-1; do
47
+
new_ami=$(aws ec2 copy-image --source-image-id $ami --source-region $region --region $cp_region --name "$name" | json ImageId)
48
+
echo " \"14.12\".\"$cp_region\".s3 = \"$new_ami\";" >> ec2-amis.nix
49
+
done
45
50
done
46
51
}
47
52