Fix nightly build failure 29/84729/2
authorManjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
Tue, 9 Apr 2019 17:43:03 +0000 (10:43 -0700)
committerManjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
Tue, 9 Apr 2019 18:10:51 +0000 (11:10 -0700)
Add ssl library path to ldconfig and import build

Change-Id: Iad92bc261747bdf2e8356da1a4e46df6f36fa93a
Issue-ID: AAF-764
Signed-off-by: Manjunath Ranganathaiah <manjunath.ranganathaiah@intel.com>
bin/base/xenialdockerfile

index ec9d310..156d7e4 100644 (file)
@@ -37,6 +37,9 @@ RUN wget https://www.openssl.org/source/openssl-1.1.0.tar.gz && \
   make install
 RUN apt-get -y install libgcrypt20-dev
 
+RUN echo "/usr/local/ssl/lib" > /etc/ld.so.conf.d/ssl.conf && \
+  ldconfig
+
 RUN apt-get -y install valgrind
 RUN wget https://github.com/tpm2-software/tpm2-tss/releases/download/2.0.0/tpm2-tss-2.0.0.tar.gz
 RUN tar -xvf tpm2-tss-2.0.0.tar.gz
@@ -95,6 +98,7 @@ RUN cd sshsm && \
 RUN cd sshsm && \
   cd tpm-util && \
   cd import && \
+  export LDFLAGS="-L/usr/local/ssl/lib" && \
   make -f sampleMakefile
 
 RUN mkdir tpm-util