From 878654574f64a8832740bfcf5203a1dc09091e95 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.dos.anjos@gmail.com>
Date: Sat, 5 May 2018 09:51:28 +0200
Subject: [PATCH] Minor fixes to packer files
---
packer/ovf.json | 4 ++--
packer/provision.json | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/packer/ovf.json b/packer/ovf.json
index 7d2b1ac..ee6cc7b 100644
--- a/packer/ovf.json
+++ b/packer/ovf.json
@@ -34,10 +34,10 @@
],
"min_packer_version": "0.7.0",
"variables": {
- "dmg_url": "OSX_InstallESD_10.9.5_13F34.dmg",
+ "dmg_url": "dmg/OSX_InstallESD_10.9.5_13F34.dmg",
"guest_os_type": "MacOS109_64",
"machine_name": "macos109",
- "output_directory": "{{env `PACKER_OUTPUT_DIR`}}",
+ "output_directory": "ovf",
"password": "gitlab",
"username": "gitlab"
}
diff --git a/packer/provision.json b/packer/provision.json
index a94fabf..1d11763 100644
--- a/packer/provision.json
+++ b/packer/provision.json
@@ -33,29 +33,29 @@
},
{
"destination": "/private/tmp/set_kcpassword.py",
- "source": "../scripts/support/set_kcpassword.py",
+ "source": "scripts/support/set_kcpassword.py",
"type": "file"
},
{
"destination": "/private/tmp/set_kcpassword.py",
- "source": "../scripts/support/set_kcpassword.py",
+ "source": "scripts/support/set_kcpassword.py",
"type": "file"
},
{
"destination": "/tmp",
- "source": "../xcode",
+ "source": "xcode",
"type": "file"
},
{
"execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
"scripts": [
- "../scripts/xcode-cli-tools.sh",
- "../scripts/add-network-interface-detection.sh",
- "../scripts/autologin.sh",
- "../scripts/system-update.sh",
- "../scripts/xcode-sdk.sh",
- "../scripts/optimize.sh",
- "../scripts/shrink.sh"
+ "scripts/xcode-cli-tools.sh",
+ "scripts/add-network-interface-detection.sh",
+ "scripts/autologin.sh",
+ "scripts/system-update.sh",
+ "scripts/xcode-sdk.sh",
+ "scripts/optimize.sh",
+ "scripts/shrink.sh"
],
"environment_vars": [
"XCODE_SDK_VERSION={{user `xcode_sdk_version`}}",
@@ -71,7 +71,7 @@
"guest_os_type": "MacOS109_64",
"machine_name": "macos109",
"xcode_sdk_version": "109",
- "output_directory": "ova/macosx109.ova",
+ "output_directory": "ova",
"password": "gitlab",
"username": "gitlab",
"provisioning_delay": "0"
--
GitLab