[CE-206] Fix vue theme npm install & build error

Change-Id: I69e2f17ac84051d6fedc98894339094780f438eb Signed-off-by: Haitao Yue <hightall@me.com>
hyperledger · Dec 25, 2017 · 88e4615 · 88e4615
1 parent ce11d3f
commit 88e4615
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/docker-compose-build-js.yml → docker-compose-build-js.yaml b/docker-compose-build-js.yml → docker-compose-build-js.yaml
@@ -14,7 +14,7 @@ version: '2'
 services:
   # cello dashboard service
   build-js:
-    image: hyperledger/cello-baseimage
+    image: node:9.3
     volumes:  # This should be removed in product env
       - ./src/$STATIC_FOLDER:/app
       - ./src/$TEMPLATE_FOLDER:/app/templates

diff --git a/docker-compose-npm-install.yml → docker-compose-npm-install.yaml b/docker-compose-npm-install.yml → docker-compose-npm-install.yaml
@@ -14,9 +14,9 @@ version: '2'
 services:
   # cello dashboard service
   npm-install:
-    image: hyperledger/cello-baseimage
+    image: node:9.3
     volumes:  # This should be removed in product env
       - ./src/$STATIC_FOLDER:/app
     environment:
       - NPM_REGISTRY=$NPM_REGISTRY
-    command: bash -c "cd /app && npm install --loglevel http --registry https://$NPM_REGISTRY"
+    command: bash -c "cd /app && npm install --loglevel http --registry $NPM_REGISTRY"
diff --git a/scripts/master_node/build_js.sh b/scripts/master_node/build_js.sh
@@ -28,7 +28,7 @@ fi
 
 
 echo_b "Start build js files..."
-docker-compose -f docker-compose-build-js.yml up --force-recreate
+docker-compose -f docker-compose-build-js.yaml up --force-recreate
 
 #echo "Restarting mongo_express"
 #[[ "$(docker ps -q --filter='name=mongo_express')" != "" ]] && docker restart mongo_express
diff --git a/scripts/master_node/npm_install.sh b/scripts/master_node/npm_install.sh
@@ -27,7 +27,7 @@ else
 fi
 
 echo_b "Start install npm packages..."
-docker-compose -f docker-compose-npm-install.yml up --force-recreate
+docker-compose -f docker-compose-npm-install.yaml up --force-recreate
 
 #echo "Restarting mongo_express"
 #[[ "$(docker ps -q --filter='name=mongo_express')" != "" ]] && docker restart mongo_express