From 6d4019e59eda897384e9c00d1daf8b2ce87d128f Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Fri, 5 Oct 2018 16:05:20 -0700
Subject: 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>
---
 src/static/bower.json | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/static')

diff --git a/src/static/bower.json b/src/static/bower.json
index f473747..9ae744a 100644
--- a/src/static/bower.json
+++ b/src/static/bower.json
@@ -20,5 +20,8 @@
     "fullcalendar": "^2.9.0",
     "jquery-migrate": "^3.0.0",
     "startbootstrap-sb-admin-2-blackrockdigital": "^3.3.7"
+  },
+  "resolutions": {
+    "font-awesome": "~4.6.3"
   }
 }
-- 
cgit