mozilla
/
MozDef
зеркало из https://github.com/mozilla/MozDef.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Remove docker-compose pull from run-cloudy-mozdef as we no longer need it

This commit is contained in:
Gene Wood 2019-03-20 21:54:26 -07:00
Родитель 3ba1aedf5c
Коммит 74f029a57a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: F0A9E7DCD39E452E
1 изменённых файлов: 3 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Makefile
Просмотреть файл

@ -30,7 +30,7 @@ run: build ## Run all MozDef containers
run-cloudy-mozdef: ## Run the MozDef containers necessary to run in AWS (`cloudy-mozdef`). This is used by the CloudFormation-initiated setup. run-cloudy-mozdef: ## Run the MozDef containers necessary to run in AWS (`cloudy-mozdef`). This is used by the CloudFormation-initiated setup.
$(shell test -f docker/compose/cloudy_mozdef.env || touch docker/compose/cloudy_mozdef.env) $(shell test -f docker/compose/cloudy_mozdef.env || touch docker/compose/cloudy_mozdef.env)
$(shell test -f docker/compose/cloudy_mozdef_kibana.env || touch docker/compose/cloudy_mozdef_kibana.env) $(shell test -f docker/compose/cloudy_mozdef_kibana.env || touch docker/compose/cloudy_mozdef_kibana.env)
docker-compose -f docker/compose/docker-compose-cloudy-mozdef.yml -p $(NAME) pull # docker-compose -f docker/compose/docker-compose-cloudy-mozdef.yml -p $(NAME) pull # Images are now in the local packer build AMI and no docker pull is needed
docker-compose -f docker/compose/docker-compose-cloudy-mozdef.yml -p $(NAME) up -d docker-compose -f docker/compose/docker-compose-cloudy-mozdef.yml -p $(NAME) up -d
.PHONY: run-env-mozdef .PHONY: run-env-mozdef
@ -118,7 +118,7 @@ hub-tagged: ## Upload locally built MozDef images tagged as the BRANCH. Branch
docker push mozdef/mozdef_elasticsearch:$(BRANCH) docker push mozdef/mozdef_elasticsearch:$(BRANCH)
docker push mozdef/mozdef_loginput:$(BRANCH) docker push mozdef/mozdef_loginput:$(BRANCH)
docker push mozdef/mozdef_mongodb:$(BRANCH) docker push mozdef/mozdef_mongodb:$(BRANCH)
docker push mozdef/mozdef_bootstrap:$(BRANCH) docker push mozdef/mozdef_bootstrap:$(BRANCH)
docker push mozdef/mozdef_alerts:$(BRANCH) docker push mozdef/mozdef_alerts:$(BRANCH)
docker push mozdef/mozdef_nginx:$(BRANCH) docker push mozdef/mozdef_nginx:$(BRANCH)
docker push mozdef/mozdef_alertplugins:$(BRANCH) docker push mozdef/mozdef_alertplugins:$(BRANCH)
@ -150,4 +150,4 @@ new-alert: ## Create an example alert and working alert unit test
.PHONY: set-version-and-fetch-docker-container .PHONY: set-version-and-fetch-docker-container
set-version-and-fetch-docker-container: build-from-cwd tag-images # Lock the release of MozDef by pulling the docker containers on AMI build and caching replace all instances of latest in the compose override with the BRANCH set-version-and-fetch-docker-container: build-from-cwd tag-images # Lock the release of MozDef by pulling the docker containers on AMI build and caching replace all instances of latest in the compose override with the BRANCH
sed -i s/latest/$(BRANCH)/g docker/compose/docker-compose-cloudy-mozdef.yml sed -i s/latest/$(BRANCH)/g docker/compose/docker-compose-cloudy-mozdef.yml