From e88b674a29d81509520a1c1169bfa33d47d6a3d1 Mon Sep 17 00:00:00 2001 From: Matt Rider Date: Thu, 3 Jan 2019 20:22:29 -0200 Subject: [PATCH] Configure docker-compose, travis multistage build --- .travis.yml | 4 ++-- docker-compose.override.yml | 3 +++ docker-compose.travis.yml | 8 ++++++++ docker-compose.yml | 4 +++- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 docker-compose.travis.yml diff --git a/.travis.yml b/.travis.yml index 0ad6b5e30..90191674c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,8 @@ before_install: - sudo mv docker-compose /usr/local/bin install: - - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT -t humanconnection/nitro-web . - - docker-compose -f docker-compose.yml up -d + - docker build --build-arg BUILD_COMMIT=$TRAVIS_COMMIT --target production -t humanconnection/nitro-web . + - docker-compose -f docker-compose.travis.yml up -d - git clone https://github.com/Human-Connection/Nitro-Backend.git ../Nitro-Backend - git -C "../Nitro-Backend" checkout $TRAVIS_BRANCH || echo "Branch \`$TRAVIS_BRANCH\` does not exist, falling back to \`master\`" - docker-compose -f ../Nitro-Backend/docker-compose.yml -f ../Nitro-Backend/docker-compose.travis.yml up -d diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 4188b42ce..0438f5fbb 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -2,6 +2,9 @@ version: '3.7' services: webapp: + build: + context: . + target: builder volumes: - .:/nitro-web - node_modules:/nitro-web/node_modules diff --git a/docker-compose.travis.yml b/docker-compose.travis.yml new file mode 100644 index 000000000..ab752a230 --- /dev/null +++ b/docker-compose.travis.yml @@ -0,0 +1,8 @@ +version: "3.7" + +services: + backend: + image: humanconnection/nitro-web:builder + build: + context: . + target: builder \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index f7c697889..c8bba8595 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,9 @@ version: '3.7' services: webapp: image: humanconnection/nitro-web:latest - build: . + build: + context: . + target: production ports: - 3000:3000 - 8080:8080