зеркало из https://github.com/mozilla/MozDef.git
support new httpsredir=no option for the access proxy
fix tester pull force pull new dkr images
This commit is contained in:
Родитель
f0f64cbd76
Коммит
0b78dbea58
2
Makefile
2
Makefile
|
@ -64,7 +64,7 @@ docker-push: hub
|
|||
hub: ## Upload locally built MozDef images tagged as the current git head (hub.docker.com/mozdef).
|
||||
docker login
|
||||
@echo "Tagging current docker images with git HEAD shorthash..."
|
||||
$(foreach var,$(DKR_IMAGES),docker tag $(var):latest mozdef/$(var):$(GITHASH);)
|
||||
$(foreach var,$(DKR_IMAGES),docker tag $(var) mozdef/$(var):$(GITHASH);)
|
||||
@echo "Uploading images to docker..."
|
||||
$(foreach var,$(DKR_IMAGES),docker push mozdef/$(var):$(GITHASH);)
|
||||
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
ES_URL=http://localhost:9200
|
||||
httpsredir=no
|
||||
|
|
|
@ -3,11 +3,14 @@ version: '2.2'
|
|||
services:
|
||||
nginx:
|
||||
image: mozillaiam/mozilla.oidc.accessproxy
|
||||
env_file:
|
||||
- cloudy_mozdef.env
|
||||
restart: always
|
||||
depends_on:
|
||||
- meteor
|
||||
ports:
|
||||
- 80:80
|
||||
- 443:80
|
||||
# - 8080:8080
|
||||
# - 9090:9090
|
||||
networks:
|
||||
|
|
|
@ -32,4 +32,4 @@ services:
|
|||
syslog:
|
||||
image: mozdef/mozdef_syslog
|
||||
tester:
|
||||
image: mozdef/mozdef-tester
|
||||
image: mozdef/mozdef_tester
|
||||
|
|
|
@ -160,6 +160,9 @@ services:
|
|||
- 514:514
|
||||
networks:
|
||||
- default
|
||||
tester:
|
||||
networks:
|
||||
- default
|
||||
|
||||
volumes:
|
||||
elasticsearch:
|
||||
|
|
Загрузка…
Ссылка в новой задаче