summaryrefslogtreecommitdiffstats
path: root/dashboard/Makefile
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-05 16:05:20 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2018-10-08 17:03:33 -0700
commitf2e83b24260b018bb7cc30421eda6c9a8cebc309 (patch)
tree14b462dd803352a1321b07bc5125e27da59158ae /dashboard/Makefile
parent2ea6c6198bc2aac73b04edad8c5a10d5534cdc2e (diff)
Development Override Compose File
Now that images are built and hosted for the dashboard and worker container the compose file can reference upstream images instead of ones locally built. A second compose file is added which overrides compose configuration so that images are built locally. Initial commands for running the container are moved into 'init.sh' which gets copied into the image, since the current images cannot be ran by themselves as they require the command listed in the compose file. The compose version bumped from 2 to 3 as there are no version 2 specific features being used that need to be modified. Change-Id: I23813a859a676ba009cba8f5a62b7153da006eef Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'dashboard/Makefile')
-rw-r--r--dashboard/Makefile11
1 files changed, 10 insertions, 1 deletions
diff --git a/dashboard/Makefile b/dashboard/Makefile
index 9070917..e5f4fb2 100644
--- a/dashboard/Makefile
+++ b/dashboard/Makefile
@@ -1,5 +1,14 @@
build:
- docker-compose build
+ docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml build
+
+dev-up:
+ docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml up -d
+
+dev-start:
+ docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml start
+
+dev-stop:
+ docker-compose -f docker-compose.yml -f docker-compose.override-dev.yml stop
up:
docker-compose up -d