Skip to content

Commit f7bff7e

Browse files
author
Lachlan Donald
committed
Merge pull request #636 from cawilson/linux-dynamic-source-ami-filter
Replaced Linux fixed AMI source with source AMI filter
1 parent 71001c1 commit f7bff7e

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

packer/buildkite-ami.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,26 @@
11
{
22
"variables": {
3-
"region": "us-east-1",
4-
"ami": "ami-00b882ac5193044e4"
3+
"region": "us-east-1"
54
},
65
"builders": [
76
{
87
"type": "amazon-ebs",
98
"region": "{{user `region`}}",
9+
<<<<<<< HEAD:packer/buildkite-ami.json
1010
"source_ami": "{{user `ami`}}",
1111
"instance_type": "i3.large",
12+
=======
13+
"source_ami_filter": {
14+
"filters": {
15+
"name": "amzn2-ami-hvm-2.0.*-gp2",
16+
"architecture": "x86_64",
17+
"virtualization-type": "hvm"
18+
},
19+
"owners": ["amazon"],
20+
"most_recent": true
21+
},
22+
"instance_type": "m5.xlarge",
23+
>>>>>>> db97804... Merge pull request #636 from cawilson/linux-dynamic-source-ami-filter:packer/linux/buildkite-ami.json
1224
"spot_price": "auto",
1325
"spot_price_auto_product": "Linux/UNIX (Amazon VPC)",
1426
"ssh_username": "ec2-user",

0 commit comments

Comments
 (0)