fix va scan issue (kubernetes#105)

stolostron · Sep 12, 2019 · c8b24eb · c8b24eb
1 parent 2c7315e
commit c8b24eb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -25,10 +25,7 @@ RUN yum update -y --exclude=GeoIP* --exclude=readline* \
   && yum install -y  openssl python python-devl \
   && curl -o /etc/yum.repos.d/alsadi-dumb-init-epel-7.repo -sSL https://copr.fedorainfracloud.org/coprs/alsadi/dumb-init/repo/epel-7/alsadi-dumb-init-epel-7.repo \
   && yum install -y dumb-init \
-  && wget http://mirror.centos.org/centos/7/updates/x86_64/Packages/kernel-devel-3.10.0-957.21.3.el7.x86_64.rpm \
   && rpm -e kernel-devel \
-  && rpm -ivh kernel-devel-3.10.0-957.21.3.el7.x86_64.rpm \
-  && rm -f kernel-devel-3.10.0-957.21.3.el7.x86_64.rpm \
   && yum clean all \
   && mkdir -p /var/log/nginx \
   && ln -sf /dev/stdout /var/log/nginx/access.log \

diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -27,6 +27,7 @@ RUN yum update -y --exclude=GeoIP* --exclude=readline* \
   && wget https://cbs.centos.org/kojifiles/packages/dumb-init/1.1.3/17.el7/ppc64le/dumb-init-1.1.3-17.el7.ppc64le.rpm \
   && yum install -y dumb-init-1.1.3-17.el7.ppc64le.rpm \
   && rm -rf dumb-init-1.1.3-17.el7.ppc64le.rpm \
+  && rpm -e kernel-devel \
   && yum clean all \
   && mkdir -p /var/log/nginx \
   && ln -sf /dev/stdout /var/log/nginx/access.log \

diff --git a/Dockerfile.rhel b/Dockerfile.rhel
@@ -20,7 +20,8 @@ RUN mkdir -p /var/log/nginx \
   && ln -sf /dev/stdout /var/log/nginx/access.log \
   && ln -sf /dev/stderr /var/log/nginx/error.log \
   && mkdir -p /opt/ibm \
-  && ln -s /usr/local/openresty /opt/ibm/router
+  && ln -s /usr/local/openresty /opt/ibm/router \
+  && rpm -e kernel-devel
 
 COPY rootfs/opt/ibm/router/nginx /opt/ibm/router/nginx
 COPY rootfs/icp-management-ingress /