From 209aa5060f7b870e90fc385fb3216bfb6b7ee775 Mon Sep 17 00:00:00 2001 From: Manjunath Ranganathaiah Date: Tue, 9 Apr 2019 14:24:20 -0700 Subject: Fix distcenter build failure Create new dir and clone to remove conflict Change-Id: I07b0f4411ee6707e9ffc57507d6fca85035843dc Issue-ID: AAF-764 Signed-off-by: Manjunath Ranganathaiah --- bin/distcenter/distcenterdockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/distcenter/distcenterdockerfile b/bin/distcenter/distcenterdockerfile index c0879ef..2378b4b 100644 --- a/bin/distcenter/distcenterdockerfile +++ b/bin/distcenter/distcenterdockerfile @@ -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 -- cgit 1.2.3-korg