From 437f085d87ce0631840106c7e3457d9a958c5cc2 Mon Sep 17 00:00:00 2001 From: Haitao Yue Date: Wed, 27 Jun 2018 10:39:32 +0800 Subject: [PATCH] [CE-397] Fix user dashboard dockerhub build error Remove nginx,mongo dockerhub image build. Change-Id: I06c8d8c5ced5ed90cf66bdace82f36fa730958d9 Signed-off-by: Haitao Yue --- Makefile | 2 +- dockerhub/latest/user-dashboard/Dockerfile | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ee822319a..08671e598 100755 --- a/Makefile +++ b/Makefile @@ -137,7 +137,7 @@ docker-operator-dashboard: build/docker/operator-dashboard/$(DUMMY) docker-clean: stop image-clean ##@Clean all existing images -DOCKERHUB_IMAGES = baseimage engine mongo nginx operator-dashboard user-dashboard watchdog ansible-agent +DOCKERHUB_IMAGES = baseimage engine operator-dashboard user-dashboard watchdog ansible-agent dockerhub: $(patsubst %,dockerhub-%,$(DOCKERHUB_IMAGES)) ##@Building latest images with dockerhub materials, to valid them diff --git a/dockerhub/latest/user-dashboard/Dockerfile b/dockerhub/latest/user-dashboard/Dockerfile index c2edb169f..299647872 100644 --- a/dockerhub/latest/user-dashboard/Dockerfile +++ b/dockerhub/latest/user-dashboard/Dockerfile @@ -7,15 +7,15 @@ MAINTAINER haitao yue "hightall@me.com" RUN cd /tmp && git clone https://github.com/hyperledger/cello.git RUN cd /tmp/cello/user-dashboard/src && cp package.json yarn.lock / && cd / && yarn install -g --verbose ENV PATH ${PATH}:/node_modules/.bin -RUN mkdir -p /var/www -RUN cp -r /tmp/cello/user-dashboard/src /var/www +RUN mv /tmp/cello/user-dashboard/src /var/www RUN cd /var/www && ln -sf /node_modules . && npm run build WORKDIR /var/www EXPOSE 8080 ENV FABRIC_VERSION 1.0.5 RUN cd /tmp && ARCH=$(echo "$(uname -s|tr '[:upper:]' '[:lower:]'|sed 's/mingw64_nt.*/windows/')-$(uname -m | sed 's/x86_64/amd64/g')" | awk '{print tolower($0)}') && echo $ARCH &&wget -c https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/${ARCH}-${FABRIC_VERSION}/hyperledger-fabric-${ARCH}-${FABRIC_VERSION}.tar.gz && tar -zxvf hyperledger-fabric-${ARCH}-${FABRIC_VERSION}.tar.gz && mv bin/configtxgen /usr/local/bin/configtxgen -COPY user-dashboard/fabric/fabric /etc/hyperledger/fabric +RUN mkdir -p /etc/hyperledger +RUN mv /tmp/cello/user-dashboard/fabric/fabric /etc/hyperledger/fabric ENV FABRIC_CFG_PATH /etc/hyperledger/fabric CMD ln -sf /node_modules . && npm run start