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
converting to 2 spaces
elreydetoda committed Aug 31, 2020
commit 197327dfc622cbe45dcc48e456be5fb0eeb3e540
28 changes: 14 additions & 14 deletions base/packer/not-working_build.sh
Original file line number Diff line number Diff line change
@@ -4,18 +4,18 @@ set -${-//[s]/}eu${DEBUG+xv}o pipefail

if [[ ! -f variables.json ]] ; then

# shellcheck disable=SC1091
source scripts/setup/env_vars
vagrant destroy -f
vagrant box update
vagrant up
set +e
vagrant ssh
set -e

unset VAGRANT_CLOUD_TOKEN PACKET_API_KEY TEXTBELT_KEY
# shellcheck disable=SC1091
source scripts/setup/env_vars

vagrant destroy -f
vagrant box update
vagrant up

set +e
vagrant ssh
set -e

unset VAGRANT_CLOUD_TOKEN PACKET_API_KEY TEXTBELT_KEY

fi

@@ -24,8 +24,8 @@ fi
# sudo ufw disable

if ! grep headless variables.json 1>/dev/null ; then
# adding headless to json file
vim variables.json
# adding headless to json file
vim variables.json
fi

# generating samurai.json packer template