try and fix Docker build

Author: matteius

Dockerfile

@@ -8,56 +8,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y \
     git cmake build-essential pkg-config \
     libavcodec-dev libavformat-dev libavutil-dev libswscale-dev \
-    libcurl4-openssl-dev sqlite3 libsqlite3-dev && \
+    libcurl4-openssl-dev sqlite3 libsqlite3-dev libmbedtls-dev && \
     rm -rf /var/lib/apt/lists/*
 
-# Build MbedTLS from source with tests disabled
-# and build shared libraries instead of static
-WORKDIR /opt
-RUN git clone --branch v3.4.0 --depth 1 https://github.com/Mbed-TLS/mbedtls.git && \
-    cd mbedtls && \
-    # Enable shared library building
-    sed -i 's/option(USE_SHARED_MBEDTLS_LIBRARY "Build shared libraries." OFF)/option(USE_SHARED_MBEDTLS_LIBRARY "Build shared libraries." ON)/g' CMakeLists.txt && \
-    mkdir build && cd build && \
-    cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF .. && \
-    make -j$(nproc) && make install && \
-    ldconfig
-
-# Create pkg-config files for MbedTLS libraries
-RUN mkdir -p /usr/local/lib/pkgconfig && \
-    echo "prefix=/usr/local\n\
-exec_prefix=\${prefix}\n\
-libdir=\${exec_prefix}/lib\n\
-includedir=\${prefix}/include\n\
-\n\
-Name: mbedtls\n\
-Description: MbedTLS Library\n\
-Version: 3.4.0\n\
-Requires.private: mbedx509\n\
-Libs: -L\${libdir} -lmbedtls\n\
-Cflags: -I\${includedir}" > /usr/local/lib/pkgconfig/mbedtls.pc && \
-    echo "prefix=/usr/local\n\
-exec_prefix=\${prefix}\n\
-libdir=\${exec_prefix}/lib\n\
-includedir=\${prefix}/include\n\
-\n\
-Name: mbedcrypto\n\
-Description: MbedTLS Crypto Library\n\
-Version: 3.4.0\n\
-Libs: -L\${libdir} -lmbedcrypto\n\
-Cflags: -I\${includedir}" > /usr/local/lib/pkgconfig/mbedcrypto.pc && \
-    echo "prefix=/usr/local\n\
-exec_prefix=\${prefix}\n\
-libdir=\${exec_prefix}/lib\n\
-includedir=\${prefix}/include\n\
-\n\
-Name: mbedx509\n\
-Description: MbedTLS X509 Library\n\
-Version: 3.4.0\n\
-Requires.private: mbedcrypto\n\
-Libs: -L\${libdir} -lmbedx509\n\
-Cflags: -I\${includedir}" > /usr/local/lib/pkgconfig/mbedx509.pc
-
 # Fetch external dependencies
 RUN mkdir -p /opt/external && \
     # ezxml
@@ -71,17 +24,9 @@ RUN mkdir -p /opt/external && \
 WORKDIR /opt
 COPY . .
 
-# Prepare build environment
-# Make a small modification to CMakeLists.txt to ensure proper linking with mbedcrypto
-RUN if grep -q "mbedtls mbedx509" CMakeLists.txt; then \
-        sed -i 's/mbedtls mbedx509/mbedtls mbedx509 mbedcrypto/g' CMakeLists.txt; \
-    fi
-
 # Build the application
 RUN mkdir -p /etc/lightnvr /var/lib/lightnvr /var/log/lightnvr /var/run/lightnvr /var/lib/lightnvr/recordings && \
     chmod -R 777 /var/lib/lightnvr /var/log/lightnvr /var/run/lightnvr && \
-    PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH \
-    LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH \
     ./scripts/build.sh --release --with-sod && \
     ./scripts/install.sh --prefix=/
 
@@ -93,19 +38,13 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Install only necessary runtime dependencies
 RUN apt-get update && apt-get install -y \
     libavcodec59 libavformat59 libavutil57 libswscale6 \
-    libcurl4 sqlite3 && \
+    libcurl4 libmbedtls14 sqlite3 && \
     rm -rf /var/lib/apt/lists/*
 
 # Create necessary directories in runtime
 RUN mkdir -p /etc/lightnvr /var/lib/lightnvr /var/log/lightnvr /var/run/lightnvr /var/lib/lightnvr/recordings && \
     chmod -R 777 /var/lib/lightnvr /var/log/lightnvr /var/run/lightnvr
 
-# Copy MbedTLS libraries from builder
-COPY --from=builder /usr/local/lib/libmbed*.so* /usr/local/lib/
-
-# Update library cache
-RUN ldconfig
-
 # Copy compiled binary and config files from builder stage
 COPY --from=builder /bin/lightnvr /bin/lightnvr
 COPY --from=builder /etc/lightnvr /etc/lightnvr