diff options
author | tomalok <tomalok@gmail.com> | 2019-04-09 07:31:03 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-09 07:31:03 -0700 |
commit | 24144391d61723da5217539f7b22b5ea37b959f0 (patch) | |
tree | b5dd174b78e38337076b39ff2871e943218a7649 | |
parent | 15dc2ba223fe539c7e5088df9dca4e8227cf6089 (diff) | |
download | alpine-ec2-ami-24144391d61723da5217539f7b22b5ea37b959f0.tar.bz2 alpine-ec2-ami-24144391d61723da5217539f7b22b5ea37b959f0.tar.xz alpine-ec2-ami-24144391d61723da5217539f7b22b5ea37b959f0.zip |
* Alpine release 3.9.3 (#47)
* take care of YAML.load(input) deprecation, per https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | README.md | 32 | ||||
-rw-r--r-- | alpine-ami.yaml | 2 | ||||
-rw-r--r-- | gen-readme.py.in | 2 | ||||
-rw-r--r-- | release.yaml | 38 | ||||
-rw-r--r-- | scrub-old-amis.py.in | 2 |
6 files changed, 39 insertions, 39 deletions
@@ -23,7 +23,7 @@ build/convert: | |||
23 | # which only supports JSON | 23 | # which only supports JSON |
24 | @echo "#!`pwd`/.py3/bin/python" > build/convert | 24 | @echo "#!`pwd`/.py3/bin/python" > build/convert |
25 | @echo "import yaml, json, sys" >> build/convert | 25 | @echo "import yaml, json, sys" >> build/convert |
26 | @echo "y = yaml.load(open(sys.argv[1]))" >> build/convert | 26 | @echo "y = yaml.full_load(open(sys.argv[1]))" >> build/convert |
27 | @echo "for k in ['ami_access','deploy_regions','add_repos','add_pkgs','add_svcs']:" >> build/convert | 27 | @echo "for k in ['ami_access','deploy_regions','add_repos','add_pkgs','add_svcs']:" >> build/convert |
28 | @echo " if k in y and isinstance(y[k], list):" >> build/convert | 28 | @echo " if k in y and isinstance(y[k], list):" >> build/convert |
29 | @echo " y[k] = ','.join(str(x) for x in y[k])" >> build/convert | 29 | @echo " y[k] = ','.join(str(x) for x in y[k])" >> build/convert |
@@ -25,22 +25,22 @@ in the not-too-distant future.* | |||
25 | 25 | ||
26 | | Alpine Release | Region Code | AMI ID | | 26 | | Alpine Release | Region Code | AMI ID | |
27 | | :------------: | ----------- | ------ | | 27 | | :------------: | ----------- | ------ | |
28 | | 3.9.2 | ap-northeast-1 | [ami-09d219b1c464db917](https://ap-northeast-1.console.aws.amazon.com/ec2/home#launchAmi=ami-09d219b1c464db917) | | 28 | | 3.9.3 | ap-northeast-1 | [ami-001e74131496d0212](https://ap-northeast-1.console.aws.amazon.com/ec2/home#launchAmi=ami-001e74131496d0212) | |
29 | | 3.9.2 | ap-northeast-2 | [ami-043701e133b99f4c4](https://ap-northeast-2.console.aws.amazon.com/ec2/home#launchAmi=ami-043701e133b99f4c4) | | 29 | | 3.9.3 | ap-northeast-2 | [ami-09a26b03424d75667](https://ap-northeast-2.console.aws.amazon.com/ec2/home#launchAmi=ami-09a26b03424d75667) | |
30 | | 3.9.2 | ap-south-1 | [ami-006cb3cc1e86815e8](https://ap-south-1.console.aws.amazon.com/ec2/home#launchAmi=ami-006cb3cc1e86815e8) | | 30 | | 3.9.3 | ap-south-1 | [ami-03534f64f8b87aafc](https://ap-south-1.console.aws.amazon.com/ec2/home#launchAmi=ami-03534f64f8b87aafc) | |
31 | | 3.9.2 | ap-southeast-1 | [ami-0a5d51100fbad6534](https://ap-southeast-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0a5d51100fbad6534) | | 31 | | 3.9.3 | ap-southeast-1 | [ami-0d5f2950efcd55b0e](https://ap-southeast-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0d5f2950efcd55b0e) | |
32 | | 3.9.2 | ap-southeast-2 | [ami-082a9d093a693e412](https://ap-southeast-2.console.aws.amazon.com/ec2/home#launchAmi=ami-082a9d093a693e412) | | 32 | | 3.9.3 | ap-southeast-2 | [ami-0660edcba4ba7c8a0](https://ap-southeast-2.console.aws.amazon.com/ec2/home#launchAmi=ami-0660edcba4ba7c8a0) | |
33 | | 3.9.2 | ca-central-1 | [ami-0ec17b6f3076af75c](https://ca-central-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0ec17b6f3076af75c) | | 33 | | 3.9.3 | ca-central-1 | [ami-0bf4ea1f0f86283bb](https://ca-central-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0bf4ea1f0f86283bb) | |
34 | | 3.9.2 | eu-central-1 | [ami-0cb14722a657df41b](https://eu-central-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0cb14722a657df41b) | | 34 | | 3.9.3 | eu-central-1 | [ami-060d9bbde8d5047e8](https://eu-central-1.console.aws.amazon.com/ec2/home#launchAmi=ami-060d9bbde8d5047e8) | |
35 | | 3.9.2 | eu-north-1 | [ami-0ab528159f4fdc29f](https://eu-north-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0ab528159f4fdc29f) | | 35 | | 3.9.3 | eu-north-1 | [ami-0a5284750fcf11d18](https://eu-north-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0a5284750fcf11d18) | |
36 | | 3.9.2 | eu-west-1 | [ami-09411a0f755d83b85](https://eu-west-1.console.aws.amazon.com/ec2/home#launchAmi=ami-09411a0f755d83b85) | | 36 | | 3.9.3 | eu-west-1 | [ami-0af60b964eb2f09d3](https://eu-west-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0af60b964eb2f09d3) | |
37 | | 3.9.2 | eu-west-2 | [ami-0d41697972c9b8bc0](https://eu-west-2.console.aws.amazon.com/ec2/home#launchAmi=ami-0d41697972c9b8bc0) | | 37 | | 3.9.3 | eu-west-2 | [ami-097405edd3790cf8b](https://eu-west-2.console.aws.amazon.com/ec2/home#launchAmi=ami-097405edd3790cf8b) | |
38 | | 3.9.2 | eu-west-3 | [ami-01d74bb07689bda40](https://eu-west-3.console.aws.amazon.com/ec2/home#launchAmi=ami-01d74bb07689bda40) | | 38 | | 3.9.3 | eu-west-3 | [ami-0078916a37514bb9a](https://eu-west-3.console.aws.amazon.com/ec2/home#launchAmi=ami-0078916a37514bb9a) | |
39 | | 3.9.2 | sa-east-1 | [ami-02f2c79c63d1f4a41](https://sa-east-1.console.aws.amazon.com/ec2/home#launchAmi=ami-02f2c79c63d1f4a41) | | 39 | | 3.9.3 | sa-east-1 | [ami-09e0025e60328ea6d](https://sa-east-1.console.aws.amazon.com/ec2/home#launchAmi=ami-09e0025e60328ea6d) | |
40 | | 3.9.2 | us-east-1 | [ami-0fe2769f64d520d1c](https://us-east-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0fe2769f64d520d1c) | | 40 | | 3.9.3 | us-east-1 | [ami-05c8c48601c2303af](https://us-east-1.console.aws.amazon.com/ec2/home#launchAmi=ami-05c8c48601c2303af) | |
41 | | 3.9.2 | us-east-2 | [ami-0065dce2cc30e41f5](https://us-east-2.console.aws.amazon.com/ec2/home#launchAmi=ami-0065dce2cc30e41f5) | | 41 | | 3.9.3 | us-east-2 | [ami-064d64386a89de1e6](https://us-east-2.console.aws.amazon.com/ec2/home#launchAmi=ami-064d64386a89de1e6) | |
42 | | 3.9.2 | us-west-1 | [ami-0cb6df99641faedde](https://us-west-1.console.aws.amazon.com/ec2/home#launchAmi=ami-0cb6df99641faedde) | | 42 | | 3.9.3 | us-west-1 | [ami-04a4711d62db12ba0](https://us-west-1.console.aws.amazon.com/ec2/home#launchAmi=ami-04a4711d62db12ba0) | |
43 | | 3.9.2 | us-west-2 | [ami-0d41eeb15d6f487e4](https://us-west-2.console.aws.amazon.com/ec2/home#launchAmi=ami-0d41eeb15d6f487e4) | | 43 | | 3.9.3 | us-west-2 | [ami-0ff56870cf29d4f02](https://us-west-2.console.aws.amazon.com/ec2/home#launchAmi=ami-0ff56870cf29d4f02) | |
44 | 44 | ||
45 | ## Caveats | 45 | ## Caveats |
46 | 46 | ||
diff --git a/alpine-ami.yaml b/alpine-ami.yaml index fb56e47..1505055 100644 --- a/alpine-ami.yaml +++ b/alpine-ami.yaml | |||
@@ -6,7 +6,7 @@ variables: | |||
6 | # NOTE: Changing arch/version/release may require modifying 'make_ami.sh'. | 6 | # NOTE: Changing arch/version/release may require modifying 'make_ami.sh'. |
7 | arch: x86_64 | 7 | arch: x86_64 |
8 | version: "3.9" | 8 | version: "3.9" |
9 | release: "3.9.2" | 9 | release: "3.9.3" |
10 | revision: "" | 10 | revision: "" |
11 | 11 | ||
12 | builders: | 12 | builders: |
diff --git a/gen-readme.py.in b/gen-readme.py.in index 5ffd4db..84e6ed4 100644 --- a/gen-readme.py.in +++ b/gen-readme.py.in | |||
@@ -7,7 +7,7 @@ ROW_TEMPLATE = "| {release} | {region} | [{ami}]({uri}) |" | |||
7 | 7 | ||
8 | 8 | ||
9 | with open("release.yaml") as fp: | 9 | with open("release.yaml") as fp: |
10 | releases = yaml.load(fp) | 10 | releases = yaml.full_load(fp) |
11 | 11 | ||
12 | for metadata in releases.values(): | 12 | for metadata in releases.values(): |
13 | release = str(metadata["alpine-release"]) | 13 | release = str(metadata["alpine-release"]) |
diff --git a/release.yaml b/release.yaml index 52f0b2c..f97beb3 100644 --- a/release.yaml +++ b/release.yaml | |||
@@ -1,22 +1,22 @@ | |||
1 | alpine-ami-3.9.2-x86_64: | 1 | alpine-ami-3.9.3-x86_64: |
2 | description: "Alpine Linux 3.9.2 x86_64" | 2 | description: "Alpine Linux 3.9.3 x86_64" |
3 | alpine-release: 3.9.2 | 3 | alpine-release: 3.9.3 |
4 | kernel-flavor: virt | 4 | kernel-flavor: virt |
5 | ami-release-date: "2019-03-03 01:03:41" | 5 | ami-release-date: "2019-03-03 01:03:41" |
6 | region-identifiers: | 6 | region-identifiers: |
7 | ap-northeast-1: ami-09d219b1c464db917 | 7 | ap-northeast-1: ami-001e74131496d0212 |
8 | ap-northeast-2: ami-043701e133b99f4c4 | 8 | ap-northeast-2: ami-09a26b03424d75667 |
9 | ap-south-1: ami-006cb3cc1e86815e8 | 9 | ap-south-1: ami-03534f64f8b87aafc |
10 | ap-southeast-1: ami-0a5d51100fbad6534 | 10 | ap-southeast-1: ami-0d5f2950efcd55b0e |
11 | ap-southeast-2: ami-082a9d093a693e412 | 11 | ap-southeast-2: ami-0660edcba4ba7c8a0 |
12 | ca-central-1: ami-0ec17b6f3076af75c | 12 | ca-central-1: ami-0bf4ea1f0f86283bb |
13 | eu-central-1: ami-0cb14722a657df41b | 13 | eu-central-1: ami-060d9bbde8d5047e8 |
14 | eu-north-1: ami-0ab528159f4fdc29f | 14 | eu-north-1: ami-0a5284750fcf11d18 |
15 | eu-west-1: ami-09411a0f755d83b85 | 15 | eu-west-1: ami-0af60b964eb2f09d3 |
16 | eu-west-2: ami-0d41697972c9b8bc0 | 16 | eu-west-2: ami-097405edd3790cf8b |
17 | eu-west-3: ami-01d74bb07689bda40 | 17 | eu-west-3: ami-0078916a37514bb9a |
18 | sa-east-1: ami-02f2c79c63d1f4a41 | 18 | sa-east-1: ami-09e0025e60328ea6d |
19 | us-east-1: ami-0fe2769f64d520d1c | 19 | us-east-1: ami-05c8c48601c2303af |
20 | us-east-2: ami-0065dce2cc30e41f5 | 20 | us-east-2: ami-064d64386a89de1e6 |
21 | us-west-1: ami-0cb6df99641faedde | 21 | us-west-1: ami-04a4711d62db12ba0 |
22 | us-west-2: ami-0d41eeb15d6f487e4 | 22 | us-west-2: ami-0ff56870cf29d4f02 |
diff --git a/scrub-old-amis.py.in b/scrub-old-amis.py.in index 2cbbcf8..34d7be3 100644 --- a/scrub-old-amis.py.in +++ b/scrub-old-amis.py.in | |||
@@ -11,7 +11,7 @@ AMI_RE = re.compile("^Alpine-(\d+\.\d+)(?:-r(\d+))?-Hardened-EC2") | |||
11 | 11 | ||
12 | # Load current AMI version from config | 12 | # Load current AMI version from config |
13 | with open("alpine-ami.yaml") as fp: | 13 | with open("alpine-ami.yaml") as fp: |
14 | ami_cfg = yaml.load(fp)["variables"] | 14 | ami_cfg = yaml.full_load(fp)["variables"] |
15 | current = (float(ami_cfg["alpine_release"]), int(ami_cfg["ami_release"])) | 15 | current = (float(ami_cfg["alpine_release"]), int(ami_cfg["ami_release"])) |
16 | 16 | ||
17 | 17 | ||