Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.0 dev packer initial merge #136

Merged
merged 23 commits into from
Sep 2, 2020
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e15ab62
combining gitignore
elreydetoda Jun 7, 2020
c76c1f3
Merge branch '5.0-dev' of github.com:SamuraiWTF/samuraiwtf into 5.0-d…
elreydetoda Jun 7, 2020
d74fc80
adding pipfile for deps
elreydetoda Jun 7, 2020
6481542
adding all necessary items for packer build
elreydetoda Jun 7, 2020
b8f5394
Merge branch '5.0-dev' of github.com:SamuraiWTF/samuraiwtf into 5.0-d…
elreydetoda Jun 8, 2020
0534f13
preping for v5.0 dev
elreydetoda Jun 8, 2020
957abed
removing becuasing not doing vmware yet
elreydetoda Jun 8, 2020
174bd8a
removing because packer requires at buildtime
elreydetoda Jun 8, 2020
f05270b
adding these for now, and we will centralize later
elreydetoda Jun 8, 2020
e89377c
converting to 2 spaces
elreydetoda Jun 8, 2020
0d5d758
moving Pipfile to project dirs
elreydetoda Jun 8, 2020
c261ff7
trying to add katana to base box build
elreydetoda Aug 31, 2020
f498f17
combining gitignore
elreydetoda Jun 7, 2020
6b80525
adding pipfile for deps
elreydetoda Jun 7, 2020
af6f02e
adding all necessary items for packer build
elreydetoda Jun 7, 2020
64beeb2
preping for v5.0 dev
elreydetoda Jun 8, 2020
de9ad67
removing becuasing not doing vmware yet
elreydetoda Jun 8, 2020
11d777d
removing because packer requires at buildtime
elreydetoda Jun 8, 2020
1fdafe2
adding these for now, and we will centralize later
elreydetoda Jun 8, 2020
197327d
converting to 2 spaces
elreydetoda Jun 8, 2020
40fbdc6
moving Pipfile to project dirs
elreydetoda Jun 8, 2020
130c8d3
trying to add katana to base box build
elreydetoda Aug 31, 2020
e92e40c
Merge branch '5.0-dev_packer' of github.com:elreydetoda/samuraiwtf-ba…
elreydetoda Aug 31, 2020
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
Prev Previous commit
Next Next commit
preping for v5.0 dev
elreydetoda committed Aug 31, 2020
commit 64beeb21473dc0a84dcf7050dba23843a68b1daf
12 changes: 8 additions & 4 deletions base/packer/scripts/util/template_alterations.py
Original file line number Diff line number Diff line change
@@ -12,6 +12,10 @@
bento_path = build_script + '/bento'
# bento_debian_path = bento_path + '/packer_templates/debian'
bento_ubuntu_path = bento_path + '/packer_templates/ubuntu'
config_dir = '{}'.format(build_script)
install_dir = '{}'.format(build_script)
# config_dir = '../../'
# install_dir = '../../'
base_box_name = 'samuraiwtf-base_box'

# start each section with a pre-defined message and it's name
@@ -187,7 +191,7 @@ def prov_alterations(json_obj):
{
"type": "shell-local",
"execute_command": [ "bash", "-c", "{{.Script}}" ],
"command": "pushd ./scripts/build/ || exit 1 && tar -czvf config.tgz config && popd"
"command": "pushd {} || exit 1 && tar -czvf config.tgz config && popd".format(config_dir)

}
)
@@ -196,7 +200,7 @@ def prov_alterations(json_obj):
prov_list.append(
{
'type': 'file',
'source': build_script + '/config.tgz',
'source': config_dir + '/config.tgz',
'destination': '/tmp/config.tgz'
}
)
@@ -205,8 +209,8 @@ def prov_alterations(json_obj):
prov_list.append(
{
'type': 'ansible-local',
'playbook_dir': build_script + '/install',
'playbook_file': './scripts/build/install/samuraiwtf.yml'
'playbook_dir': install_dir + '/install',
'playbook_file': '{}/install/samuraiwtf.yml'.format(install_dir)
}
)