Permalink
Browse files

upgrade travis docker-compose as per https://docs.travis-ci.com/user/…

  • Loading branch information...
gdestuynder committed Oct 30, 2018
1 parent 7e72569 commit bb1175e8d13d4e4e04a972b3079ee0dfca3500d1
Showing with 11 additions and 6 deletions.
  1. +7 −0 .travis.yml
  2. +4 −5 Makefile
  3. +0 −1 docker/compose/docker-compose.yml
@@ -6,9 +6,16 @@ branches:
# Restrict push builds to only master
only:
- master
env:
- DOCKER_COMPOSE_VERSION=1.22.0
before_install:
# Fail immediately on any error
- set -e
# See https://docs.travis-ci.com/user/docker/
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
install:
# Build containers
# Use BUILD_MODE=pull if you prefer pulling existing images
@@ -61,14 +61,13 @@ down: ## Shutdown all services we started with docker-compose
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 $(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);)
docker-compose -f docker/compose/docker-compose.yml -p $(NAME) push
docker-compose -f docker/compose/docker-compose-test.yml -p test-$(NAME) push
docker-get: hub-get
hub-get: ## Download all pre-built images (hub.docker.com/mozdef)
$(foreach var,$(DKR_IMAGES),docker pull mozdef/$(var):$(GITHASH);)
docker-compose -f docker/compose/docker-compose.yml -p $(NAME) pull
docker-compose -f docker/compose/docker-compose-test.yml -p test-$(NAME) pull
.PHONY: clean
clean: ## Cleanup all docker volumes and shutdown all related services
@@ -204,7 +204,6 @@ services:
cache_from:
- mozdef/mozdef_mq_worker
- mozdef_mq_worker:latest
image: mozdef_mq_worker
restart: always
command: bash -c 'source /opt/mozdef/envs/python/bin/activate && python esworker_eventtask.py -c esworker_eventtask.conf'
depends_on:

0 comments on commit bb1175e

Please sign in to comment.