From dd79554660e0f81cc8723243235e82e8769490f7 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Tue, 16 Jun 2020 18:00:04 -0700 Subject: Update cFW instruction set The cFW example has been changed since 1.3.0 version. This commit reduces the steps to setup and provision this CNF. Its main goal is to simplify deployment process. Issue-ID: MULTICLOUD-301 Change-Id: Id96ea4b427aff4c42ecfd43b42fa5d6970c4a6df Signed-off-by: Victor Morales --- kud/tests/cFW/vpp/Dockerfile | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'kud/tests/cFW/vpp/Dockerfile') diff --git a/kud/tests/cFW/vpp/Dockerfile b/kud/tests/cFW/vpp/Dockerfile index 63b08b01..a04e0236 100644 --- a/kud/tests/cFW/vpp/Dockerfile +++ b/kud/tests/cFW/vpp/Dockerfile @@ -1,17 +1,16 @@ -FROM ubuntu:16.04 +FROM ubuntu:18.04 MAINTAINER Victor Morales -ARG HTTP_PROXY=${HTTP_PROXY} -ARG HTTPS_PROXY=${HTTPS_PROXY} +ENV VERSION "19.01.2-release" -ENV http_proxy $HTTP_PROXY -ENV https_proxy $HTTPS_PROXY - -RUN apt-get update && apt-get install -y -qq apt-transport-https \ - && echo "deb [trusted=yes] https://nexus.fd.io/content/repositories/fd.io.stable.1609.ubuntu.xenial.main/ ./" | tee -a /etc/apt/sources.list.d/99fd.io.list \ +RUN apt-get update \ + && apt-get install -y -qq --no-install-recommends curl ca-certificates gnupg2 \ + && echo "deb [trusted=yes] https://packagecloud.io/fdio/release/ubuntu bionic main" | tee /etc/apt/sources.list.d/99fd.io.list \ + && curl -L https://packagecloud.io/fdio/release/gpgkey | apt-key add - \ + && mkdir -p /var/log/vpp/ \ && apt-get update \ - && apt-get install -y -qq vpp vpp-lib vpp-plugins + && apt-get install -y -qq --no-install-recommends vpp=$VERSION vpp-lib=$VERSION vpp-plugins=$VERSION -COPY 80-vpp.conf /etc/sysctl.d/80-vpp.conf +COPY startup.conf /etc/vpp/startup.conf CMD ["/usr/bin/vpp", "-c", "/etc/vpp/startup.conf"] -- cgit 1.2.3-korg