Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions packer/aws/aws-builder.pkr.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ locals {
}

source "amazon-ebs" "XS" {
ami_name = "Sourcegraph-XS (v${var.instance_version}) ${var.instance_sizes.xs.instance_type}"
ami_description = "Sourcegraph-XS (v${var.instance_version}) ${var.instance_sizes.xs.instance_type}"
ami_name = "Sourcegraph (v${var.instance_version}) ${var.instance_sizes.xs.instance_type}"
ami_description = "Sourcegraph (v${var.instance_version}) ${var.instance_sizes.xs.instance_type}"
instance_type = var.instance_sizes.xs.instance_type
region = var.build_in_region
ami_regions = local.regions
Expand Down Expand Up @@ -392,10 +392,10 @@ build {
name = "sourcegraph-amis"
sources = var.dev ? ["source.amazon-ebs.DEV"] : [
"source.amazon-ebs.XS",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we get rid of this one too?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh wait, that's the only one left that doesn't need sizing anymore. I see

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I'll go in here and do some cleanup after. This is just getting it out the door for today.

"source.amazon-ebs.S",
"source.amazon-ebs.M",
"source.amazon-ebs.L",
"source.amazon-ebs.XL"
# "source.amazon-ebs.S",
# "source.amazon-ebs.M",
# "source.amazon-ebs.L",
# "source.amazon-ebs.XL"
]
provisioner "shell" {
inline = [
Expand All @@ -404,7 +404,7 @@ build {
}
provisioner "file" {
destination = "/home/ec2-user/deploy"
source = "./"
source = "./"
}
provisioner "shell" {
except = ["amazon-ebs.DEV"]
Expand All @@ -420,7 +420,7 @@ build {
inline = ["sudo rm /home/ec2-user/.ssh/authorized_keys && sudo rm /root/.ssh/authorized_keys"]
}
post-processor "manifest" {
output = "manifest.json"
output = "manifest.json"
strip_path = true
custom_data = {
sourcegraph_version = "v${var.instance_version}"
Expand Down
Loading