projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix(compute-images): add resolver variable to json files
[arvados.git]
/
tools
/
compute-images
/
arvados-images-azure.json
diff --git
a/tools/compute-images/arvados-images-azure.json
b/tools/compute-images/arvados-images-azure.json
index c8db9499cda716240ed8ba421d9f72d496a0bf27..ec1d9b6a6379a0fddba94ffed7184f8e4f2d07ea 100644
(file)
--- a/
tools/compute-images/arvados-images-azure.json
+++ b/
tools/compute-images/arvados-images-azure.json
@@
-1,23
+1,22
@@
{
"variables": {
{
"variables": {
- "resource_group": null,
+ "account_file": "",
+ "arvados_cluster": "",
+ "build_environment": "azure-arm",
"client_id": "{{env `ARM_CLIENT_ID`}}",
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
"client_id": "{{env `ARM_CLIENT_ID`}}",
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
- "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
- "tenant_id": "{{env `ARM_TENANT_ID`}}",
- "build_environment": "azure-arm",
"cloud_environment_name": "Public",
"cloud_environment_name": "Public",
- "location": "centralus",
- "ssh_user": "packer",
- "ssh_private_key_file": "{{env `PACKERPRIVKEY`}}",
"image_sku": "",
"image_sku": "",
- "
arvados_cluster": "
",
+ "
location": "centralus
",
"project_id": "",
"project_id": "",
- "account_file": "",
- "fqdn": "",
- "resolver": "",
+ "public_key_file": "",
"reposuffix": "",
"reposuffix": "",
- "public_key_file": ""
+ "resolver": "",
+ "resource_group": null,
+ "ssh_private_key_file": "{{env `PACKERPRIVKEY`}}",
+ "ssh_user": "packer",
+ "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
+ "tenant_id": "{{env `ARM_TENANT_ID`}}"
},
"builders": [
{
},
"builders": [
{
@@
-66,6
+65,6
@@
"type": "shell",
"execute_command": "sudo -S env {{ .Vars }} /bin/bash '{{ .Path }}'",
"script": "scripts/base.sh",
"type": "shell",
"execute_command": "sudo -S env {{ .Vars }} /bin/bash '{{ .Path }}'",
"script": "scripts/base.sh",
- "environment_vars": ["R
OLE=compute","R
ESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}"]
+ "environment_vars": ["RESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}"]
}]
}
}]
}