[master] Fix Ipsec caused u2004 bug (#762)

* Update Docker image README (#704) * update README * Update dockerfiles * fix ipsecmb caused system fault in u2004 Co-authored-by: jhou5 <[email protected]>
OpenVisualCloud · Jul 2, 2021 · 808f711 · 808f711
1 parent 9147f64
commit 808f711
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/QAT/centos-7/media/dev/Dockerfile b/QAT/centos-7/media/dev/Dockerfile
@@ -120,7 +120,7 @@ RUN cd /opt/build && \
     cd intel-ipsec-mb && \
     (. /opt/rh/devtoolset-9/enable && CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y )  && \
     make install && \
-    make install PREFIX=/opt/dist
+    make install PREFIX=/opt/dist 
 
 RUN yum install -y wget make gcc gawk autoconf automake libtool pkg-config
 

diff --git a/QAT/centos-7/media/nginx_sw/Dockerfile b/QAT/centos-7/media/nginx_sw/Dockerfile
@@ -120,7 +120,7 @@ RUN cd /opt/build && \
     cd intel-ipsec-mb && \
     (. /opt/rh/devtoolset-9/enable && CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y )  && \
     make install && \
-    make install PREFIX=/opt/dist
+    make install PREFIX=/opt/dist 
 
 RUN yum install -y wget make gcc gawk autoconf automake libtool pkg-config
 

diff --git a/QAT/ubuntu-18.04/media/dev/Dockerfile b/QAT/ubuntu-18.04/media/dev/Dockerfile
@@ -127,7 +127,7 @@ RUN cd /opt/build && \
     cd intel-ipsec-mb && \
     CC="gcc-9" CXX="g++-9" CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y  && \
     make install && \
-    make install PREFIX=/opt/dist
+    make install PREFIX=/opt/dist\/usr/local 
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

diff --git a/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-18.04/media/nginx_sw/Dockerfile
@@ -127,7 +127,7 @@ RUN cd /opt/build && \
     cd intel-ipsec-mb && \
     CC="gcc-9" CXX="g++-9" CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y  && \
     make install && \
-    make install PREFIX=/opt/dist
+    make install PREFIX=/opt/dist\/usr/local 
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

diff --git a/QAT/ubuntu-20.04/media/dev/Dockerfile b/QAT/ubuntu-20.04/media/dev/Dockerfile
@@ -123,7 +123,7 @@ RUN cd /opt/build && \
     cd intel-ipsec-mb && \
     CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y  && \
     make install && \
-    make install PREFIX=/opt/dist
+    make install PREFIX=/opt/dist\/usr/local 
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

diff --git a/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile b/QAT/ubuntu-20.04/media/nginx_sw/Dockerfile
@@ -123,7 +123,7 @@ RUN cd /opt/build && \
     cd intel-ipsec-mb && \
     CFLAGS="-Wl,-rpath=/usr/local/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y  && \
     make install && \
-    make install PREFIX=/opt/dist
+    make install PREFIX=/opt/dist\/usr/local 
 
 RUN apt-get update && \
   DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \

diff --git a/template/components/ipsecmb.m4 b/template/components/ipsecmb.m4
@@ -51,7 +51,7 @@ RUN cd BUILD_HOME && \
     cd intel-ipsec-mb && \
     ifelse(OS_NAME:OS_VERSION,centos:7,`(. /opt/rh/devtoolset-9/enable && ')ifelse(OS_NAME:OS_VERSION,ubuntu:18.04,CC="gcc-9" CXX="g++-9" )CFLAGS="-Wl,-rpath=BUILD_PREFIX/ssl/lib" make -j SAFE_DATA=y SAFE_PARAM=y SAFE_LOOKUP=y ifelse(OS_NAME:OS_VERSION,centos:7,`) ') && \
     make install && \
-    make install PREFIX=BUILD_DESTDIR
+    make install ifelse(OS_NAME,ubuntu,PREFIX=BUILD_DESTDIR\BUILD_PREFIX,PREFIX=BUILD_DESTDIR) 
 ')
 
 REG(IPSECMB)