dockerfile update

docker/Dockerfile.upf-vpp.rhel7

@@ -117,7 +117,13 @@ COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/startup_debug.conf .
 COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/upf_profile.json .
 
 WORKDIR /usr/lib64
-COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/ .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvppinfra.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvnet.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvlibmemory.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvlib.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libsvm.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libnat.so.21.01.1 .
 
 RUN ldconfig
 

docker/Dockerfile.upf-vpp.ubuntu18 → docker/Dockerfile.upf-vpp.ubuntu

@@ -21,14 +21,15 @@
 #---------------------------------------------------------------------
 #
 # Dockerfile for the VPP-UPF service
-#   Valid for Ubuntu-18.04 (bionic)
+#   Valid for Ubuntu-18.04 (bionic) and Ubuntu-20.04 (focal)
 #
 #---------------------------------------------------------------------
 #---------------------------------------------------------------------
 # BUILDER IMAGE
 #---------------------------------------------------------------------
 
-FROM ubuntu:18.04 AS vpp-upf-builder
+ARG BASE_IMAGE=ubuntu:18.04
+FROM $BASE_IMAGE AS vpp-upf-builder
 
 ARG NEEDED_GIT_PROXY
 ENV DEBIAN_FRONTEND=noninteractive
@@ -76,7 +77,7 @@ RUN make build-release -C vpp
 #---------------------------------------------------------------------
 # TARGET IMAGE
 #---------------------------------------------------------------------
-FROM ubuntu:bionic as oai-upf-vpp
+FROM $BASE_IMAGE as oai-upf-vpp
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Europe/Paris
 
@@ -111,7 +112,13 @@ COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/startup_debug.conf .
 COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/upf_profile.json .
 
 WORKDIR /usr/lib/x86_64-linux-gnu/
-COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/ .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/vpp_plugins .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvppinfra.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvnet.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvlibmemory.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libvlib.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libsvm.so.21.01.1 .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/libnat.so.21.01.1 .
 
 RUN ldconfig
 

docs/BUILD_IMAGE.md

@@ -20,11 +20,20 @@ Here in our network configuration, we need to pass the "GIT PROXY" configuration
 
 ```bash
 $ docker build --target oai-upf-vpp --tag oai-upf-vpp:latest \
-               --file docker/Dockerfile.upf-vpp.ubuntu18 \
+               --file docker/Dockerfile.upf-vpp.ubuntu \
                --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" .
 ```
 
-##  3.2 On a RHEL 7 Host ##
+## 3.2 On a Ubuntu 20.04 Host ##
+
+```bash
+$ docker build --target oai-upf-vpp --tag oai-upf-vpp:latest \
+               --file docker/Dockerfile.upf-vpp.ubuntu \
+               --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" \
+               --build-arg BASE_IMAGE=ubuntu:20.04 .
+```
+
+##  3.3 On a RHEL 7 Host ##
 
 ```bash
 $ docker build --target oai-upf-vpp --tag oai-upf-vpp:latest \