From 38f1e68d1cf379a2fc24fd803ee4c77bc9db1783 Mon Sep 17 00:00:00 2001 From: Krishna Harsha Voora Date: Mon, 15 Jan 2018 04:01:02 -0500 Subject: [PATCH] [CE-232] Pull architecture specific binaries Currently we are fetching x86 specific binaries from nexus. This PR ensures that we pull in architecture specific binaries. Change-Id: I12437db1e1f87fb250e6f5fe241cb04c9f134d5f Signed-off-by: Krishna Harsha Voora --- dockerhub/user-dashboard/Dockerfile | 5 ++--- user-dashboard/Dockerfile | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dockerhub/user-dashboard/Dockerfile b/dockerhub/user-dashboard/Dockerfile index 595c89f95..2981ac1d8 100644 --- a/dockerhub/user-dashboard/Dockerfile +++ b/dockerhub/user-dashboard/Dockerfile @@ -37,8 +37,7 @@ RUN mkdir -p /usr/app RUN cp -r /tmp/cello/user-dashboard /usr/app/src WORKDIR /usr/app/src ENV FABRIC_VERSION 1.0.5 -RUN cd /tmp && wget -c https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/linux-amd64-${FABRIC_VERSION}/hyperledger-fabric-linux-amd64-${FABRIC_VERSION}.tar.gz \ - && tar -zxvf hyperledger-fabric-linux-amd64-${FABRIC_VERSION}.tar.gz && mv bin/configtxgen /usr/local/bin/configtxgen +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 RUN mkdir -p /etc/hyperledger RUN cp -r /tmp/cello/user-dashboard/fabric/fabric /etc/hyperledger/fabric COPY --from=build_login /usr/app/src/src/public/js/dist /usr/app/src/src/public/js/dist @@ -46,4 +45,4 @@ COPY --from=build_home /usr/app/src/src/public/js/dist /usr/app/src/src/public/j COPY --from=build_dashboard /usr/app/src/src/public/js/dist /usr/app/src/src/public/js/dist ENV FABRIC_CFG_PATH /etc/hyperledger/fabric EXPOSE 8080 -CMD ["npm", "start"] \ No newline at end of file +CMD ["npm", "start"] diff --git a/user-dashboard/Dockerfile b/user-dashboard/Dockerfile index 4901e307b..0896af5f8 100644 --- a/user-dashboard/Dockerfile +++ b/user-dashboard/Dockerfile @@ -7,15 +7,14 @@ FROM node:9.2 MAINTAINER haitao yue "hightall@me.com" RUN npm install -g requirejs COPY package.json / -RUN cd / && yarn install -g --verbose +RUN cd / && yarn install -g RUN yarn add nodemon -g ENV PATH ${PATH}:/node_modules/.bin RUN mkdir -p /usr/app/src #COPY . /usr/app/src WORKDIR /usr/app/src ENV FABRIC_VERSION 1.0.5 -RUN cd /tmp && wget -c https://nexus.hyperledger.org/content/repositories/releases/org/hyperledger/fabric/hyperledger-fabric/linux-amd64-${FABRIC_VERSION}/hyperledger-fabric-linux-amd64-${FABRIC_VERSION}.tar.gz \ - && tar -zxvf hyperledger-fabric-linux-amd64-${FABRIC_VERSION}.tar.gz && mv bin/configtxgen /usr/local/bin/configtxgen +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 fabric/fabric /etc/hyperledger/fabric ENV FABRIC_CFG_PATH /etc/hyperledger/fabric #RUN mv /usr/app/src/js /reactjs && \