From c2c09c15a656b413f25d30345eb54e7d48add845 Mon Sep 17 00:00:00 2001 From: fujinhua Date: Tue, 12 Sep 2017 19:18:33 +0800 Subject: Change sfc-driver docker system to centos7 Change-Id: Ic2d84356d316418189cec55ece7d5f157e060ae7 Issue-Id: VFC-341 Signed-off-by: fujinhua --- .../src/main/assembly/docker/Dockerfile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile index 3a90231..3076abc 100644 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/Dockerfile @@ -1,18 +1,12 @@ -FROM ubuntu:14.04 +FROM centos:7 -ARG HTTP_PROXY=${HTTP_PROXY} -ARG HTTPS_PROXY=${HTTPS_PROXY} +RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf +RUN sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo +RUN yum update -y -ENV http_proxy $HTTP_PROXY -ENV https_proxy $HTTPS_PROXY - -RUN apt-get update && apt-get install -y software-properties-common -RUN apt-get install -y wget && \ - apt-get install -y unzip && \ - apt-get install -y curl && \ - apt-get install -y build-essential && \ - apt-get install -y libssl-dev -RUN sudo -E add-apt-repository ppa:openjdk-r/ppa && apt-get update && apt-get install -y openjdk-8-jdk && apt-get install -y git curl && apt-get install -y pandoc +RUN yum install -y wget unzip socat java-1.8.0-openjdk-headless +RUN sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/jre/lib/security/java.security +ENV JAVA_HOME /usr/lib/jvm/jre ADD . /service WORKDIR /service -- cgit 1.2.3-korg