Skip to content

Commit

Permalink
Merge pull request #528 from EverythingMe/chore/packer_update
Browse files Browse the repository at this point in the history
Cleanup packer.json (no longer building GCE image with it).
  • Loading branch information
arikfr committed Aug 9, 2015
2 parents 650ccac + 446148d commit 9ff8db3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 24 deletions.
1 change: 1 addition & 0 deletions setup/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ if [ "$(id -u)" != "0" ]; then
fi

# Base packages
apt-get dist-upgrade
apt-get update
apt-get install -y python-pip python-dev nginx curl build-essential pwgen
pip install -U setuptools
Expand Down
28 changes: 4 additions & 24 deletions setup/packer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,27 @@
"variables": {
"aws_access_key": "",
"aws_secret_key": "",
"redash_version": "0.4.0.b589",
"image_version": "040b589"
"redash_version": "0.7.1.b1015",
"image_version": "071b1015"
},
"builders": [
{
"name": "redash-us-east-1",
"type": "amazon-ebs",
"access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}",
"region": "us-east-1",
"source_ami": "ami-fe7cc796",
"instance_type": "t2.micro",
"ssh_username": "ubuntu",
"ami_name": "redash-{{user `image_version`}}-us-east-1"
},
{
"name": "redash-eu-west-1",
"type": "amazon-ebs",
"access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}",
"region": "eu-west-1",
"source_ami": "ami-d2ff50a5",
"source_ami": "ami-20cc9d57",
"instance_type": "t2.micro",
"ssh_username": "ubuntu",
"ami_name": "redash-{{user `image_version`}}-eu-west-1"
},
{
"type": "googlecompute",
"bucket_name": "redash-images",
"account_file": "account.json",
"client_secrets_file": "client_secret.json",
"project_id": "redash-bird-123",
"source_image": "debian-7-wheezy-v20141017",
"zone": "us-central1-a",
"image_name": "redash-{{user `image_version`}}"
}
],
"provisioners": [
{
"type": "shell",
"script": "bootstrap.sh",
"execute_command": "{{ .Vars }} sudo -E -S bash '{{ .Path }}'",
"environment_vars": ["REDASH_VERSION={{user `redash_version`}}"]
}
]
Expand Down

0 comments on commit 9ff8db3

Please sign in to comment.