Fix distcenter build failure 54/84754/1
authorManjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
Tue, 9 Apr 2019 21:24:20 +0000 (14:24 -0700)
committerManjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
Tue, 9 Apr 2019 21:29:09 +0000 (14:29 -0700)
Create new dir and clone to remove conflict

Change-Id: I07b0f4411ee6707e9ffc57507d6fca85035843dc
Issue-ID: AAF-764
Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
bin/distcenter/distcenterdockerfile

index c0879ef..2378b4b 100644 (file)
@@ -1,13 +1,16 @@
 FROM nexus3.onap.org:10001/onap/aaf/aaf-base-xenial:latest
 
-RUN git clone https://gerrit.onap.org/r/aaf/sshsm
-RUN cd sshsm && \
+RUN mkdir -p /src
+RUN cd src && \
+  git clone https://gerrit.onap.org/r/aaf/sshsm
+RUN cd src && \
+  cd sshsm && \
   cd tpm-util && \
   cd duplicate && \
   make -f sampleMakefile
 RUN mkdir -p /dup/bin && \
-   cp sshsm/tpm-util/duplicate/ossl_tpm_duplicate /dup/bin && \
-   rm -rf sshsm
+   cp src/sshsm/tpm-util/duplicate/ossl_tpm_duplicate /dup/bin && \
+   rm -rf src
 
 RUN mkdir -p /distcenter/bin
 COPY ./create_ca.sh /distcenter/bin