CI: missing archives folder creation; DOCKER: cleanup

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -158,6 +158,7 @@ pipeline {
                 // Currently this pipeline only runs for pushes to `develop` branch
                 // First clean image registry
                 myShCmd('docker image rm oai-upf:' + upf_tag + ' || true', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
+                myShCmd('mkdir -p archives', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
                 myShCmd('docker build --no-cache --target oai-upf-vpp --tag oai-upf-vpp:' + upf_tag + ' --file docker/Dockerfile.upf-vpp.ubuntu18 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/upf_docker_image_build.log 2>&1', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
                 myShCmd('docker image ls >> archives/upf_docker_image_build.log', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
               }

docker/Dockerfile.upf-vpp.rhel7

@@ -28,7 +28,7 @@
 #---------------------------------------------------------------------
 # BUILDER IMAGE
 #---------------------------------------------------------------------
-FROM registry.access.redhat.com/ubi7/ubi:latest AS vpp-upg-builder
+FROM registry.access.redhat.com/ubi7/ubi:latest AS vpp-upf-builder
 
 ARG NEEDED_GIT_PROXY
 
@@ -80,6 +80,7 @@ RUN make install-dep build-release -C vpp/
 # TARGET IMAGE
 #---------------------------------------------------------------------
 FROM registry.access.redhat.com/ubi7/ubi:latest as oai-upf-vpp
+ENV TZ=Europe/Paris
 
 # We install some debug tools for the moment in addition of mandatory libraries
 RUN yum repolist --disablerepo=* && \
@@ -88,6 +89,7 @@ RUN yum repolist --disablerepo=* && \
       net-tools \
       iputils \
       tshark \
+      tzdata\
       iproute \
       wget && \
     wget http://repo.openfusion.net/centos7-x86_64/hyperscan-devel-5.3.0-1.of.el7.x86_64.rpm \
@@ -98,26 +100,26 @@ RUN yum repolist --disablerepo=* && \
     rm -rf /var/lib/apt/lists/*
 
 WORKDIR /openair-upf/bin
-COPY --from=vpp-upg-builder /vpp-upf/scripts/entrypoint.sh .
-COPY --from=vpp-upg-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vpp .
-COPY --from=vpp-upg-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl .
+COPY --from=vpp-upf-builder /vpp-upf/scripts/entrypoint.sh .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vpp .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl .
 
 WORKDIR /openair-upf/etc
-COPY --from=vpp-upg-builder /vpp-upf/scripts/upg_conf/init.conf .
-COPY --from=vpp-upg-builder /vpp-upf/scripts/upg_conf/startup_debug.conf .
+COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/init.conf .
+COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/startup_debug.conf .
 
 WORKDIR /usr/lib64
-COPY --from=vpp-upg-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/ .
 
 RUN ldconfig
 
 RUN groupadd vpp
 
 WORKDIR /openair-upf
-COPY --from=vpp-upg-builder /vpp-upg/scripts/run.sh  .
+COPY --from=vpp-upf-builder /vpp-upf/scripts/run.sh  .
 
 #expose
 EXPOSE 8085/udp 2152/udp
 
-ENTRYPOINT ["/openair-upg/bin/entrypoint.sh"]
+ENTRYPOINT ["/openair-upf/bin/entrypoint.sh"]
 CMD ["/openair-upf/run.sh"]

docker/Dockerfile.upf-vpp.ubuntu18

+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
 # * Unless required by applicable law or agreed to in writing, software
 # * distributed under the License is distributed on an "AS IS" BASIS,
 # * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -83,25 +94,27 @@ RUN apt-get update && \
         vim \
   && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /openair-upf/bin/
-COPY --from=vpp-upf-builder /vpp-upf/scripts/entrypoint.sh /openair-upf/bin/entrypoint.sh
-COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vpp vpp
-COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl vppctl
+WORKDIR /openair-upf/bin
+COPY --from=vpp-upf-builder /vpp-upf/scripts/entrypoint.sh .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vpp .
+COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/bin/vppctl .
 
 WORKDIR /openair-upf/etc
-COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/init.conf /openair-upf/etc/init.conf
-COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/startup_debug.conf /openair-upf/etc/startup_debug.conf
+COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/init.conf .
+COPY --from=vpp-upf-builder /vpp-upf/scripts/upf_conf/startup_debug.conf .
 
 WORKDIR /usr/lib/x86_64-linux-gnu/
 COPY --from=vpp-upf-builder /vpp-upf/vpp/build-root/install-vpp-native/vpp/lib/ .
+
 RUN ldconfig
+
 RUN groupadd vpp
 
-WORKDIR /openair-upf/
-COPY --from=vpp-upf-builder /vpp-upf/scripts/run.sh  /openair-upf/run.sh
+WORKDIR /openair-upf
+COPY --from=vpp-upf-builder /vpp-upf/scripts/run.sh  .
 
 #expose
-#EXPOSE 8085/udp 2152/udp
+EXPOSE 8085/udp 2152/udp
 
 ENTRYPOINT ["/openair-upf/bin/entrypoint.sh"]
 CMD ["/openair-upf/run.sh"]