docker: move scripts from ci to a new location inside docker folder

Author: asaezper

.gitlab-ci.yml

@@ -72,6 +72,7 @@ trigger builder:
           - .gitlab/ci/src_cache.yml
           - .gitlab/ci/builders.yml
           - .gitlab/ci/builders/**/*
+          - docker/scripts/**/*
   trigger:
     include: .gitlab/ci/builders.yml
     strategy: depend
@@ -83,12 +84,6 @@ trigger docker:
       changes:
         paths:
           - .gitlab/ci/docker.yml
-          - .gitlab/ci/builders/builder.sh
-          - .gitlab/ci/builders/build_uhd.sh
-          - .gitlab/ci/builders/build_dpdk.sh
-          - .gitlab/ci/builders/install_dependencies.sh
-          - .gitlab/ci/builders/install_uhd_dependencies.sh
-          - .gitlab/ci/builders/install_dpdk_dependencies.sh
           - docker/**/*.{yml,env,json,toml,py,sh,csv,py,toml}
           - docker/**/Dockerfile
           - .gdbinit
@@ -401,7 +396,7 @@ pages:
     - mv coverage_html public/
     - mv codechecker*html public/
     - mv docs/index.html public/index.html
-    - .gitlab/ci/builders/install_dependencies.sh
+    - docker/scripts/install_dependencies.sh
     - apt-get update && apt-get install -y --no-install-recommends rsync
     - |
       rm -Rf build

.gitlab/ci/builders.yml

@@ -83,8 +83,8 @@ ubuntu-uhd-builder:
     # Install dependencies and compile
     - |
       build_uhd() {
-        .gitlab/ci/builders/install_uhd_dependencies.sh build
-        .gitlab/ci/builders/build_uhd.sh ${uhd_version} native ${KUBERNETES_CPU_REQUEST}
+        docker/scripts/install_uhd_dependencies.sh build
+        docker/scripts/build_uhd.sh ${uhd_version} native ${KUBERNETES_CPU_REQUEST}
         mkdir -p ${CI_PROJECT_DIR}/.gitlab/ci/builders/uhd
         cp -r /opt/uhd/${uhd_version} ${CI_PROJECT_DIR}/.gitlab/ci/builders/uhd/${uhd_version}
       }
@@ -164,8 +164,8 @@ ubuntu-dpdk-builder:
     # Install dependencies and compile
     - |
       build_dpdk() {
-        .gitlab/ci/builders/install_dpdk_dependencies.sh build
-        .gitlab/ci/builders/build_dpdk.sh ${dpdk_version} native ${KUBERNETES_CPU_REQUEST}
+        docker/scripts/install_dpdk_dependencies.sh build
+        docker/scripts/build_dpdk.sh ${dpdk_version} native ${KUBERNETES_CPU_REQUEST}
         mkdir -p ${CI_PROJECT_DIR}/.gitlab/ci/builders/dpdk
         cp -r /opt/dpdk/${dpdk_version} ${CI_PROJECT_DIR}/.gitlab/ci/builders/dpdk/${dpdk_version}
       }
@@ -232,7 +232,10 @@ ubuntu-dpdk-builder:
       export DOCKERFILE=$CONTEXT/$OS_FAMILY
       export BUILD_ARGS="OS_NAME=${OS_NAME};VERSION=${OS_VERSION};TAG=${VERSION};RHEL_VERSION=${RHEL_CT_VERSION};CR_REGISTRY_URI=${CR_REGISTRY_URI}"
     - |
-      mkdir -p $CONTEXT/uhd $CONTEXT/dpdk  # make sure those jobs that don't need UHD can copy something
+      cp -r ${CI_PROJECT_DIR}/docker/scripts/. ${CI_PROJECT_DIR}/${CONTEXT}
+      ls -lah $CONTEXT
+    - |
+      mkdir -p $CONTEXT/uhd $CONTEXT/dpdk
       ls -lah $CONTEXT/uhd $CONTEXT/dpdk
   needs:
     - builder version
@@ -288,6 +291,8 @@ image-build-publish [codechecker]:
       export CONTEXT=.gitlab/ci/builders
       export DOCKERFILE=$CONTEXT/codechecker
       export BUILD_ARGS="CR_REGISTRY_URI=${CR_REGISTRY_URI};CI_TOOLS_REPO=${CI_TOOLS_REPO}"
+    - |
+      cp -r ${CI_PROJECT_DIR}/docker/scripts/. ${CI_PROJECT_DIR}/${CONTEXT}
   needs:
     - builder version
   cache:

.gitlab/ci/builders/version.yml

@@ -20,18 +20,20 @@ builder version:
   script:
     - |
       hash_multiple() {
-        # Create a temporary tar archive of the folder
+        # Create a temporary tar archive of the folders
         temp_archive=$(mktemp)
-        tar -cf "$temp_archive" -C "$@" --mtime='1970-01-01' --sort=name .
+        
+        # Create a tar archive with the provided folders
+        tar -cf "$temp_archive" --directory="${CI_PROJECT_DIR}" --mtime='1970-01-01' --sort=name "$@"
 
         # Generate the hash of the archive using sha256sum
         hash=$(sha256sum "$temp_archive" | cut -c 1-32)
         echo "$hash"
 
         # Clean up the temporary archive
         rm "$temp_archive"
-      } 
-    - DOCKER_BUILDER_VERSION=$(hash_multiple .gitlab/ci/builders)
+      }
+    - DOCKER_BUILDER_VERSION=$(hash_multiple .gitlab/ci/builders docker/scripts)
     - echo "DOCKER_BUILDER_VERSION=$DOCKER_BUILDER_VERSION" >> builder.env
     - echo ${DOCKER_BUILDER_VERSION}
   artifacts:

.gitlab/ci/docker.yml

@@ -32,12 +32,7 @@ variables:
 .gnb-docker:
   - changes: &srs_container_changes
       paths:
-        - .gitlab/ci/builders/builder.sh
-        - .gitlab/ci/builders/build_uhd.sh
-        - .gitlab/ci/builders/build_dpdk.sh
-        - .gitlab/ci/builders/install_dependencies.sh
-        - .gitlab/ci/builders/install_uhd_dependencies.sh
-        - .gitlab/ci/builders/install_dpdk_dependencies.sh
+        - docker/scripts/**/*
         - docker/Dockerfile
 
 .uhd_params:
@@ -65,6 +60,7 @@ no docker changes:
         - docker/metrics_server/**/*
         - docker/open5gs/**/*
         - docker/grafana/**/*
+        - docker/scripts/**/*
       when: never
     - if: $ON_MR
   script:

docker/Dockerfile

@@ -34,22 +34,22 @@ ADD . /src
 
 # Install srsRAN build dependencies
 ARG LIB
-RUN /src/.gitlab/ci/builders/install_dependencies.sh build && \
-    /src/.gitlab/ci/builders/install_${LIB}_dependencies.sh build
+RUN /src/docker/scripts/install_dependencies.sh build && \
+    /src/docker/scripts/install_${LIB}_dependencies.sh build
 
 ARG LIB_VERSION
 ARG ARCH
 ARG NUM_CORES
 
 # Compile UHD/DPDK
-RUN /src/.gitlab/ci/builders/build_${LIB}.sh ${LIB_VERSION} ${ARCH} ${NUM_CORES}
+RUN /src/docker/scripts/build_${LIB}.sh ${LIB_VERSION} ${ARCH} ${NUM_CORES}
 
 # Compile srsRAN Project
 ARG EXTRA_CMAKE_ARGS=""
 RUN if [ -z "$NUM_CORES" ]; then NUM_CORES=$(nproc); fi && \
     LIB_UPPER=$(echo $LIB | tr '[:lower:]' '[:upper:]') && \
     export ${LIB_UPPER}_DIR="/opt/${LIB}/${LIB_VERSION}" && \
-    /src/.gitlab/ci/builders/builder.sh \
+    /src/docker/scripts/builder.sh \
     -m -j${NUM_CORES} \
     -DBUILD_TESTS=False \
     -DENABLE_${LIB_UPPER}=On \
@@ -73,8 +73,8 @@ COPY --from=builder /opt/${LIB}/${LIB_VERSION} /usr/local
 COPY --from=builder /usr/local /usr/local
 
 # Copy the install dependencies scripts
-ADD .gitlab/ci/builders/install_${LIB}_dependencies.sh /usr/local/etc/install_lib_dependencies.sh
-ADD .gitlab/ci/builders/install_dependencies.sh /usr/local/etc/install_srsran_dependencies.sh
+ADD docker/scripts/install_${LIB}_dependencies.sh /usr/local/etc/install_lib_dependencies.sh
+ADD docker/scripts/install_dependencies.sh /usr/local/etc/install_srsran_dependencies.sh
 
 # Install srsran and lib runtime dependencies
 RUN /usr/local/etc/install_srsran_dependencies.sh run && \