File tree Expand file tree Collapse file tree 1 file changed +14
-2
lines changed Expand file tree Collapse file tree 1 file changed +14
-2
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"variables" : {
3
- "region" : " us-east-1" ,
4
- "ami" : " ami-00b882ac5193044e4"
3
+ "region" : " us-east-1"
5
4
},
6
5
"builders" : [
7
6
{
8
7
"type" : " amazon-ebs" ,
9
8
"region" : " {{user `region`}}" ,
9
+ <<<<<<< HEAD:packer/buildkite-ami.json
10
10
"source_ami" : " {{user `ami`}}" ,
11
11
"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
12
24
"spot_price" : " auto" ,
13
25
"spot_price_auto_product" : " Linux/UNIX (Amazon VPC)" ,
14
26
"ssh_username" : " ec2-user" ,
You can’t perform that action at this time.
0 commit comments