Граф коммитов

78 Коммитов

Автор SHA1 Сообщение Дата
Andrew Krug 5cc8158129
parallel build 2019-05-10 11:49:22 -07:00
Andrew Krug 1261232367
begin removing OIDC as a requirement. Make SSL optional. 2019-05-08 08:43:36 -07:00
Gene Wood 7519a94186
Use systemd to launch docker containers
This changes from launching docker containers with docker compose
via a make target to a systemd service.

This should ensure graceful shutdown of containers upon instance shutdown.
Previously containers were not shutting down gracefully causing a leftover
lock file for mongodb in the EFS filesystem
2019-04-19 12:58:31 +01:00
Gene Wood 7fe0541dcd
Move to model where we build once in CodeBuild and fetch images in packer 2019-04-09 15:30:56 -07:00
Gene Wood f20e70264f
Fix docker push and tag
* Only tag an image as latest if it came from master branch
* Upload images to dockerhub tagged as latest in addition to those tagged as the branch
2019-03-29 15:41:00 -07:00
Brandon Myers bbde458b4b
Fixup remaining alertplugin references in makefile 2019-03-29 15:42:47 -05:00
Gene Wood 3ea1563122
Merge branch 'master' into march_swarm
# Conflicts:
#	docker/compose/docker-compose-cloudy-mozdef.yml
2019-03-26 14:52:37 -07:00
Gene Wood 8c65a04605
Fix missing and grouped Makefile phony lines 2019-03-25 08:05:12 -07:00
Gene Wood 30b8cf24d5
Revert attempts to improve sed command
This reverts my efforts to fix #1163 where I tried improving the
sed line that modifies the compose file
* #1165
* #1168

I opened issue #1169 to explore solving this further
2019-03-22 16:52:47 -07:00
Gene Wood e21231c11e
Fix sed line issue with make intepreting dollar sign 2019-03-22 15:34:39 -07:00
Gene Wood 1887c4269f
Make the sed regex more specific so it only affects MozDef container images 2019-03-22 14:32:30 -07:00
Gene Wood 421983eeb7
Add build make target that mirrors previous behavior
Previous behavior of build was the build-from-cwd behavior
2019-03-22 14:31:56 -07:00
Gene Wood 74f029a57a
Remove docker-compose pull from run-cloudy-mozdef as we no longer need it 2019-03-20 21:54:26 -07:00
Brandon Myers f4c9d4ca04
Rename alert plugins to actions in docker env 2019-03-20 15:25:22 -05:00
Andrew Krug 5dd00449d6
fix tag target to standalone 2019-03-20 11:28:35 -07:00
Andrew Krug 9434eab751
fix typos in build targets 2019-03-20 11:07:09 -07:00
Andrew Krug 5327feb52a
try to pass branch name to multi-target 2019-03-20 11:02:23 -07:00
Andrew Krug 45cbaebaf8
fix typo 2019-03-20 10:57:25 -07:00
Andrew Krug d11c2f9f03
update make target to run in packer 2019-03-20 10:54:02 -07:00
Andrew Krug 02558d2f3d
sed in place 2019-03-20 10:34:53 -07:00
Andrew Krug df290da3ec
add make target to cache container artifacts and add latest to mozdef built containers by default 2019-03-20 10:34:52 -07:00
Andrew Krug 85688e7bd6
add buildspec and make target for logging into dockerhub as the service user 2019-03-19 09:59:22 -07:00
Andrew Krug fa5ae7b69d
clarify comments on targets 2019-03-18 16:10:57 -07:00
Andrew Krug f782092fec
change top level build target to have build from cwd or github branch to enable CD 2019-03-18 15:56:56 -07:00
Jon Moroney 887784d198 Actually working with ENV file existence check and env variable setting for docker-compose command 2019-02-01 10:49:59 -08:00
Jon Moroney 69e253143b Update to iheritance model in Makefile 2019-01-28 14:53:33 -08:00
Jon Moroney d9a6ec17c9 Add user defined env make target 2019-01-28 10:55:00 -08:00
Brandon Myers ca362d687b
Merge pull request #987 from mozilla/enable_test_resources_external
Add new make target for running test resources externally
2018-11-29 11:40:46 -06:00
Brandon Myers 637d1c7a31
Add new make target for running test resources externally 2018-11-28 13:39:53 -06:00
Jon Moroney 24652048a1 Add option to do a rebuild when running tests. Very helpful when you don't know if your tests are correct 2018-11-27 11:53:55 -08:00
Brandon Myers e9fd8d3f87
Add new make target to run only resources for tests 2018-11-14 15:21:48 -06:00
Brandon Myers 322535aa1c
Remove leftover comment in makefile 2018-10-31 14:29:34 -05:00
Brandon Myers 685a911b39
Add new-alert make target to create alert and unit test template 2018-10-31 14:21:29 -05:00
Guillaume Destuynder 1939c60143
run flake everywhere for now as it needs more logic in order to detect
where to run it
2018-10-30 14:04:16 -07:00
Guillaume Destuynder b67f010cd8
typo 2018-10-30 14:03:23 -07:00
Guillaume Destuynder bb1175e8d1
upgrade travis docker-compose as per https://docs.travis-ci.com/user/docker/ 2018-10-30 13:53:07 -07:00
Guillaume Destuynder 7e72569d55
allow for make TEST_CASE=tests/alerts/test_proxy_drop_exfil_execute.py
cleanups
don't shutdown test env on test completion as i suspect it doesnt work
for some people's workflow
2018-10-30 13:40:13 -07:00
Guillaume Destuynder d1f0f3a9ea
separate compose for tests from main compose 2018-10-30 13:15:43 -07:00
Guillaume Destuynder 67c92b592e
port build system to docker compose 3.7
use dependency-based builds
default to GITHASH=latest instead of the opposite
rename mq_event-task to mq_worker where it wasn't
fix dockerfiles to import from mozdef/* by default
introduce `make BUILD_MODE=pull` to pull images (instead of build)
2018-10-30 13:01:47 -07:00
Brandon Myers 56b9ef9627
Rename generic mq_eventtask container to worker 2018-10-24 15:45:03 -05:00
andrewkrug 95d9437061
makefile must always build base 2018-10-22 16:06:32 -07:00
Guillaume Destuynder 4aaebef166
easy target to restart cloudymozdef 2018-10-19 09:49:41 -07:00
Guillaume Destuynder 37fdb0aab2
"multiple fixes"
- makefile whitelist what to upload to s3
- use a kibana reverse proxy
- use an additional env file for the proxy
- expose new ports
- other things?
2018-10-18 08:58:28 -07:00
Guillaume Destuynder bc0ba6e17b
dont override the docker/compose/cloudy_mozdef.env by making a local
file instead and touching the current one
2018-10-18 08:43:48 -07:00
Guillaume Destuynder 0b78dbea58
support new httpsredir=no option for the access proxy
fix tester pull
force pull new dkr images
2018-10-18 08:21:27 -07:00
Guillaume Destuynder 0d678526b7
swap nginx for oidc access proxy entierely
auto pull  cloudmozdef on make
2018-10-17 16:45:40 -07:00
Guillaume Destuynder dbedba3039
do not use the norebuild system for cloudymozdef 2018-10-17 15:40:43 -07:00
Guillaume Destuynder a7f5ddfb61
typo 2018-10-17 14:37:47 -07:00
Guillaume Destuynder 1e1278ed94
Change all files to be compose 2.2 compliant (its either that or all 3.0
but certain features are them docker-swarm only)

Change the rebuild/norebuild mechanism to use a parameter instead of
different targets for simplicity
2018-10-17 14:33:13 -07:00
Guillaume Destuynder f04a0e6671
make runonly target and test targets that don't need rebuilding 2018-10-17 12:46:42 -07:00