Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Archive the docs html directory"
[releng/builder.git]
/
packer
/
templates
/
docker.json
diff --git
a/packer/templates/docker.json
b/packer/templates/docker.json
index c7ff21543f07ea3936e0e0bcd1e836eba3ca90c4..5fccb455aa46d95c0c5f1b2a37c32aca63d380ae 100644
(file)
--- a/
packer/templates/docker.json
+++ b/
packer/templates/docker.json
@@
-7,7
+7,6
@@
"public_tenant": null,
"public_user": null,
"public_pass": null,
"public_tenant": null,
"public_user": null,
"public_pass": null,
-
"private_base_image": null,
"private_network": null,
"private_cloud_user": null,
"private_base_image": null,
"private_network": null,
"private_cloud_user": null,
@@
-15,7
+14,6
@@
"private_tenant": null,
"private_user": null,
"private_pass": null,
"private_tenant": null,
"private_user": null,
"private_pass": null,
-
"distro": null,
"cloud_user_data": null
},
"distro": null,
"cloud_user_data": null
},
@@
-60,6
+58,7
@@
"scripts": [
"provision/baseline.sh",
"provision/docker.sh",
"scripts": [
"provision/baseline.sh",
"provision/docker.sh",
+ "provision/system_reseal_local_env.sh",
"provision/system_reseal.sh"
],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
"provision/system_reseal.sh"
],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"