Cleanup on dockerfile names

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

CHANGELOG.md

 # RELEASE NOTES: #
 
-<<<<<<< HEAD
 ## v1.0.0 -- Jan 2021 ##
-=======
-## vX.X.X -- YYY 2021 ##
->>>>>>> Initial Commit
 
 * Initial release
 

README.md

@@ -59,7 +59,6 @@ The OpenAirInterface CN NRF software is composed of the following parts:
 
 <pre>
 openair-cn5g-nrf
-<<<<<<< HEAD
 ├── 3gpp-specs:    Directory containing 3GPP specification files (YAML) used to implement NRF network function. 
 ├── build:         Build directory, contains targets and object files generated by compilation of network functions. 
     ├── log:       Directory containing build log files.
@@ -75,9 +74,4 @@ openair-cn5g-nrf
     ├── oai_nrf:   NRF main directory, contains the "main" CMakeLists.txt file.
     ├── nrf_app:   NRF network functions procedures and contexts.
     └── test:      Directory containing some example profiles for e.g., AMF, SMF.
-=======
-├── ci-scripts:    Directory containing the script files for CI framework.
-└── src:           Source files of NRF.
-    ├── common:    Common header files
->>>>>>> Initial Commit
 </pre>

ci-scripts/Jenkinsfile-GitLab-Docker

@@ -179,7 +179,7 @@ pipeline {
                     echo "Maybe a previous build went wrong"
                   }
                   // In case of push to `develop` branch we build from scratch
-                  myShCmd('docker build --no-cache --target oai-nrf --tag oai-nrf:' + nrf_tag + ' --file docker/Dockerfile.ubuntu.18.04 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/nrf_docker_image_build.log 2>&1', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
+                  myShCmd('docker build --no-cache --target oai-nrf --tag oai-nrf:' + nrf_tag + ' --file docker/Dockerfile.nrf.ubuntu18 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/nrf_docker_image_build.log 2>&1', rem_u18_host_flag, rem_u18_host_user, rem_u18_host)
                 }
                 if ("MERGE".equals(env.gitlabActionType)) {
                   try {
@@ -236,7 +236,7 @@ pipeline {
                   myShCmd('mkdir -p tmp/ca tmp/entitlement', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   myShCmd('cp /etc/pki/entitlement/*pem tmp/entitlement', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   myShCmd('sudo cp /etc/rhsm/ca/redhat-uep.pem tmp/ca', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
-                  myShCmd('sudo podman build --no-cache --target oai-nrf --tag oai-nrf:' + nrf_tag + ' --file docker/Dockerfile.nrf.rhel8.2 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/nrf_podman_image_build.log 2>&1', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
+                  myShCmd('sudo podman build --no-cache --target oai-nrf --tag oai-nrf:' + nrf_tag + ' --file docker/Dockerfile.nrf.rhel8 --build-arg NEEDED_GIT_PROXY="http://proxy.eurecom.fr:8080" . > archives/nrf_podman_image_build.log 2>&1', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   myShCmd('sudo podman image ls >> archives/nrf_podman_image_build.log', rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)
                   if ("MERGE".equals(env.gitlabActionType)) {
                     myShCmd('sudo podman image tag oai-nrf:' + nrf_tag + ' oai-nrf:' + rhel_nrf_tag, rem_rhel_host_flag, rem_rhel_host_user, rem_rhel_host)