From 13df7b4fea8bae7ed8db61fd65b52c97aa800a6a Mon Sep 17 00:00:00 2001 From: Jason Kendall Date: Thu, 27 Feb 2020 19:50:42 -0500 Subject: [PATCH] Split docker-compose and build-docker-compose --- .travis.yml | 3 ++- build-docker-compose.yml | 16 ++++++++++++++++ docker-compose.yml | 9 --------- 3 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 build-docker-compose.yml diff --git a/.travis.yml b/.travis.yml index 0573770..c1baef5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,4 +10,5 @@ before_install: - sudo mv docker-compose /usr/local/bin script: - - docker-compose build + - docker-compose -f docker-compose.yml -f build-docker-compose.yml build + diff --git a/build-docker-compose.yml b/build-docker-compose.yml new file mode 100644 index 0000000..87ae843 --- /dev/null +++ b/build-docker-compose.yml @@ -0,0 +1,16 @@ +version: '3' +services: + misp: + image: coolacid/misp-docker:core-latest + build: + context: server/. + args: + - MISP_TAG=${MISP_TAG} + - PHP_VER=${PHP_VER} + + misp-modules: + image: coolacid/misp-docker:modules-latest + build: + context: modules/. + args: + - MODULES_TAG=${MODULES_TAG} diff --git a/docker-compose.yml b/docker-compose.yml index d6ea604..b729c16 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -20,11 +20,6 @@ services: misp: image: coolacid/misp-docker:core-latest - build: - context: server/. - args: - - MISP_TAG=${MISP_TAG} - - PHP_VER=${PHP_VER} depends_on: - redis - db @@ -46,10 +41,6 @@ services: misp-modules: image: coolacid/misp-docker:modules-latest - build: - context: modules/. - args: - - MODULES_TAG=${MODULES_TAG} environment: - "REDIS_BACKEND=redis" depends_on: