[CE-357] Fix user dashboard fabric client not work

Add yarn.lock file to install special version packages. Remove package.json for user dashboard in dockerhub. Change-Id: I34bd007a6fe84702cc552c6bb3f7cb66f52d0d11 Signed-off-by: Haitao Yue <hightall@me.com>
hyperledger · May 9, 2018 · 4b251f0 · 4b251f0
1 parent 47f3cc6
commit 4b251f0
Show file tree

Hide file tree

Showing 5 changed files with 5,416 additions and 63 deletions.
diff --git a/docker/user-dashboard/Dockerfile.in b/docker/user-dashboard/Dockerfile.in
@@ -27,6 +27,7 @@ MAINTAINER haitao yue "hightall@me.com"
 RUN npm install -g requirejs
 COPY . /tmp/cello
 COPY user-dashboard/package.json /
+COPY user-dashboard/yarn.lock /
 RUN cd / && yarn install -g --verbose
 ENV PATH ${PATH}:/node_modules/.bin
 RUN mkdir -p /usr/app

diff --git a/dockerhub/latest/user-dashboard/Dockerfile b/dockerhub/latest/user-dashboard/Dockerfile
@@ -30,8 +30,7 @@ FROM node:8.9
 MAINTAINER haitao yue "hightall@me.com"
 RUN npm install -g requirejs
 RUN cd /tmp && git clone https://github.com/hyperledger/cello.git
-COPY package.json /
-RUN cd / && yarn install -g --verbose
+RUN cp /tmp/cello/user-dashboard && cp package.json yarn.lock / && cd / && yarn install -g --verbose
 ENV PATH ${PATH}:/node_modules/.bin
 RUN mkdir -p /usr/app
 RUN cp -r /tmp/cello/user-dashboard /usr/app/src

diff --git a/dockerhub/latest/user-dashboard/package.json b/dockerhub/latest/user-dashboard/package.json
diff --git a/user-dashboard/package.json b/user-dashboard/package.json
@@ -24,8 +24,8 @@
     "socket.io": "^2.0.4",
     "moment": "^2.19.1",
     "moment-range": "^3.0.3",
-    "fabric-client": "^1.0.4",
-    "fabric-ca-client": "^1.0.4",
+    "fabric-client": "1.0.5",
+    "fabric-ca-client": "1.0.5",
     "log4js": "^0.6.38",
     "uuid4": "^1.0.0",
     "fs-extra": "^4.0.2",