Added gitlab CI

.github/workflows/full-test.yaml

-name: full-test
-on: [push]
-
-
-jobs:
-
-  native-build:
-    runs-on: ubuntu-latest
-    steps:
-    
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install required packages
-        run: sudo $GITHUB_WORKSPACE/.ci_scripts/native-build/install_packages.sh
-
-      - name: Build project with CMake
-        run: $GITHUB_WORKSPACE/build.sh -C $GITHUB_WORKSPACE
-
-      - name: Run CUnit tests
-        run: $GITHUB_WORKSPACE/.ci_scripts/native-build/run_tests.sh
-
-      - name: Run Valgrind on CUnit tests
-        run: $GITHUB_WORKSPACE/.ci_scripts/native-build/run_tests.sh valgrind
-
-      - name: Run cppcheck on source files
-        run: $GITHUB_WORKSPACE/.ci_scripts/native-build/run_cppcheck.sh
-      
-      - name: Add NFTables rules
-        run:  $GITHUB_WORKSPACE/.ci_scripts/native-build/add_nft_rules.sh
-
-      - name: Run NFQueue executables
-        run: $GITHUB_WORKSPACE/.ci_scripts/native-build/run_exec.sh
-
-
-  cross-compile:
-    runs-on: ubuntu-latest
-    container: fdekeers/openwrt_tl-wdr4900_gha
-
-    steps:
-
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Run cross-compilation
-        run: $GITHUB_WORKSPACE/build.sh -C $GITHUB_WORKSPACE -t $GITHUB_WORKSPACE/openwrt/tl-wdr4900.cmake

.gitlab-ci.yaml

+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+
+# Natively build and test the project
+job-native-build:
+  script:
+    - sudo .ci_scripts/native-build/install_packages.sh
+    - firewall/build.sh -C firewall
+    - .ci_scripts/native-build/run_tests.sh
+    - .ci_scripts/native-build/run_tests.sh valgrind
+    - .ci_scripts/native-build/run_cppcheck.sh
+    - .ci_scripts/native-build/add_nft_rules.sh
+    - .ci_scripts/native-build/run_exec.sh
+
+
+# Cross-compile the project for the TL-WDR4900 router
+job-cross-compilation:
+  script:
+    - docker compose run cross-compilation /home/user/iot-firewall/docker_cmd.sh tl-wdr4900 $(id -u $USER) $(id -g $USER)

.ci_scripts/cross-compile/Dockerfile → Dockerfile

 # Dockerfile describing the container used to
-# cross-compile the projet for OpenWrt,
-# in GitHub Actions.
+# cross-compile the projet for OpenWrt.
 # The default platform is the TP-Link WDR4900.
 
 # Base image: Ubuntu 22.04 LTS
@@ -13,8 +12,7 @@ ARG TOOLCHAIN_DIR=toolchain-powerpc_8540_gcc-11.2.0_musl
 ARG TARGET_DIR=target-powerpc_8540_musl
 
 # Set initial working directory
-ENV HOME=/root
-WORKDIR ${HOME}
+WORKDIR /
 
 # Install dependencies
 RUN apt-get update && \
@@ -36,8 +34,16 @@ RUN apt-get update && \
     zlib1g-dev \
     file \
     wget \
-    cmake \
-    python3-pip
+    cmake
+
+# Create non-root user
+ARG USER=user
+ARG UID=1000
+ARG HOME=/home/${USER}
+RUN groupadd --gid ${UID} ${USER} && \
+    useradd --uid ${UID} --gid ${UID} -m ${USER} -s /bin/bash
+USER ${USER}
+WORKDIR ${HOME}
 
 # Clone OpenWrt repository
 ENV OPENWRT_HOME=${HOME}/openwrt
@@ -50,8 +56,7 @@ RUN ${OPENWRT_HOME}/scripts/feeds update -a
 RUN ${OPENWRT_HOME}/scripts/feeds install -a
 
 # Configure OpenWrt toolchain
-COPY openwrt/${ROUTER}/config/config-minimal ${OPENWRT_HOME}/.config
-ENV FORCE_UNSAFE_CONFIGURE=1
+COPY --chown=$USER:$USER openwrt/${ROUTER}/config-minimal ${OPENWRT_HOME}/.config
 RUN make defconfig
 RUN make download
 RUN make -j $(($(nproc)+1))
@@ -62,5 +67,6 @@ ENV C_INCLUDE_PATH=${TARGET_PATH}/usr/include
 ENV LD_LIBRARY_PATH=${TARGET_PATH}/usr/lib
 ENV PATH=${TOOLCHAIN_PATH}/bin:$PATH
 
-# Get ready for next steps
-WORKDIR ${HOME}
+# Switch back to root user
+USER root
+WORKDIR /root

docker-compose.yaml

 services:
-  openwrt:
+  cross-compilation:
     image: fdekeers/openwrt_tl-wdr4900
     #image: fdekeers/openwrt_linksys-wrt1200ac
     container_name: openwrt-firewall
@@ -8,6 +8,6 @@ services:
       #- ROUTER=linksys-wrt1200ac
     volumes:
       - .:/home/user/iot-firewall
-    command: ["/home/user/iot-firewall/build.sh", "-t", "/home/user/iot-firewall/openwrt/tl-wdr4900.cmake"]
-    #command: ["/home/user/iot-firewall/build.sh", "-t", "/home/user/iot-firewall/openwrt/linksys-wrt1200ac.cmake"]
+    command: ["/home/user/iot-firewall/docker_cmd.sh", "tl-wdr4900", "1000", "1000"]
+    #command: ["/home/user/iot-firewall/docker_cmd.sh", "linksys-wrt1200ac", "1000", "1000"]
     restart: no

docker_cmd.sh

+#!/bin/bash
+
+# Script to run inside the cross-compilation Docker container.
+
+
+# Base directory
+BASE_DIR="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+
+
+### ARGUMENTS ###
+
+# Print usage information
+usage() {
+    echo "Usage: $0 ROUTER NEW_ID NEW_GID" 1>&2
+    exit 1
+}
+
+# Verify number of arguments
+if [[ $# -ne 2 ]] && [[ $# -ne 3 ]]; then
+    usage
+fi
+
+## Get command line arguments
+ROUTER=$1
+NEW_UID=$2
+# GID (optional)
+# If not provided, equal to UID
+if [[ $# -eq 2 ]]; then
+    NEW_GID=$NEW_UID
+elif [[ $# -eq 3 ]]; then
+    NEW_GID=$3
+fi
+
+
+### MAIN ###
+
+# Cross-compile sources
+"$BASE_DIR"/build.sh -C "$BASE_DIR" -t "$BASE_DIR"/firewall/openwrt/$ROUTER/$ROUTER.cmake
+
+# Change perimissions
+ROOT_UID=0
+for DIR in build bin; do
+    DIR="$BASE_DIR"/$DIR
+    find $DIR -uid $ROOT_UID -exec chown -h $NEW_UID {} \;
+    find $DIR -gid $ROOT_UID -exec chgrp -h $NEW_GID {} \;
+done