Improvements to Docker builds

Co-authored-by: Thulinma <jaron@vietors.com>

Author: Rokamun

.dockerignore

@@ -1,4 +1,4 @@
 build
 .git
-Dockerfile
+Dockerfile.*
 

Dockerfile.mistserver

@@ -1,17 +1,53 @@
 FROM alpine AS mist_build
+# Pull in build requirements
+RUN apk add --no-cache git patch meson ninja gcc g++ linux-headers pigz curl cjson pkgconfig
 
-RUN apk add --no-cache git patch meson ninja gcc g++ linux-headers pigz curl
+# Build dependencies librist, libsrt, libsrtp2, usrsctplib, mbedtls
+RUN mkdir -p /deps/build/mbedtls /deps/build/libsrtp /deps/build/libsrt /deps/build/librist /deps/build/usrsctp /deps/mbedtls /deps/libsrtp /deps/libsrt /deps/librist /deps/usrsctp
+
+# mbedtls
+ADD --unpack=true https://github.com/Mbed-TLS/mbedtls/releases/download/mbedtls-3.6.5/mbedtls-3.6.5.tar.bz2 /deps
+ADD subprojects/packagefiles/mbedtls/meson.build /deps/mbedtls-3.6.5/
+ADD subprojects/packagefiles/mbedtls/include/mbedtls/mbedtls_config.h /deps/mbedtls-3.6.5/include/mbedtls/
+RUN cd /deps/build/mbedtls/ && meson setup /deps/mbedtls-3.6.5 -Dstrip=true && meson install
+
+# srtp
+ADD https://github.com/cisco/libsrtp.git#v2.6.0 /deps/libsrtp
+RUN cd /deps/build/libsrtp/ && meson setup /deps/libsrtp -Dstrip=true  && meson install
+
+# srt
+ADD https://github.com/Haivision/srt.git#v1.5.4 /deps/libsrt
+ADD subprojects/packagefiles/libsrt/meson.build /deps/libsrt/
+ADD subprojects/packagefiles/libsrt/srt/meson.build /deps/libsrt/srt/
+RUN cd /deps/build/libsrt/ && meson setup /deps/libsrt -Dstrip=true  && meson install
+
+# librist
+ADD https://code.videolan.org/rist/librist.git#v0.2.11 /deps/librist
+RUN cd /deps/build/librist/ && meson setup /deps/librist -Dstrip=true  && meson install
+
+# usrsctp
+ADD https://github.com/sctplab/usrsctp.git#0.9.5.0 /deps/usrsctp
+RUN cd /deps/build/usrsctp/ && meson setup /deps/usrsctp -Dstrip=true  && meson install
+
+# Build MistServer from local source
 ADD . /src/
+ARG MIST_OPTS
+ARG DEBUG=3
+ARG VERSION=Unknown
+ARG TARGETPLATFORM
+ARG RELEASE=Docker_${TARGETPLATFORM}
+RUN mkdir /build/ && cd /build && meson setup /src -DDOCKERRUN=true -DNOUPDATE=true -DDEBUG=${DEBUG} -DVERSION=${VERSION} -DRELEASE=${RELEASE} -Dstrip=true ${MIST_OPTS} && ninja install
 
+# Upload debug symbols if requested
 ARG OUTPUT_DBG
+RUN if [ -n "${OUTPUT_DBG+x}" ]; then tar cf - /build /src /deps | pigz -6 | curl --upload-file - "${OUTPUT_DBG}" ; fi
 
-RUN mkdir /build/; cd /build; meson setup /src -DDOCKERRUN=true -Dlibrist:default_library=static -Dmbedtls:default_library=static -DDEBUG=3 -Dstrip=true; ninja install; if [ -n "${OUTPUT_DBG+x}" ]; then tar cf - /build /src | pigz -6 | curl --upload-file - "${OUTPUT_DBG}" ; fi
-
+# Prepare final image from stripped (installed) copy of build
 FROM alpine
-RUN apk add --no-cache libstdc++
+RUN apk add --no-cache libstdc++ cjson
 COPY --from=mist_build /usr/local/ /usr/local/
-
 LABEL org.opencontainers.image.authors="Jaron Viëtor <jaron.vietor@ddvtech.com>"
-EXPOSE 4242 8080 1935 5554
+EXPOSE 4242 8080 1935 5554 8889/udp 18203/udp
 ENTRYPOINT ["MistController"]
 HEALTHCHECK CMD ["MistUtilHealth"]
+

meson.build

@@ -31,15 +31,15 @@ if git.found()
     if fs.is_file('VERSION')
       version = fs.read('VERSION').strip()
     else 
-      version = 'Unknown'
+      version = get_option('VERSION')
     endif
   endif
 else
   fs = import('fs') 
   if fs.is_file('VERSION')
     version = fs.read('VERSION').strip()
   else 
-    version = 'Unknown'
+    version = get_option('VERSION')
   endif
 endif
 

meson_options.txt

@@ -17,6 +17,7 @@ option('STAT_CUTOFF', description: 'Time in seconds that statistics history is k
 option('NORIST', description: 'Disable building RIST support, regardless of library being present (by default RIST is enabled if libraries are installed)', type : 'boolean', value : false)
 option('NOSRT', description: 'Disable building SRT support, regardless of library being present (by default SRT is enabled if libraries are installed)', type : 'boolean', value : false)
 option('RELEASE', description: 'Release string used in the reported version information', type: 'string', value: 'DEFAULT')
+option('VERSION', description: 'Version string used in the reported version information', type: 'string', value: 'Unknown')
 option('DEBUG', description: 'Default debug level. Recommended value for development is 4, recommended value for production is 3', type: 'integer', value: 4)
 option('NOGA', description: 'Disables Google Analytics entirely in the LSP', type: 'boolean', value: false)
 option('LOAD_BALANCE', description: 'Build the load balancer (WIP)', type: 'boolean', value: false)

subprojects/packagefiles/mbedtls/meson.build

@@ -3,6 +3,108 @@ add_project_arguments(['-Wno-stringop-overflow'], language: 'c')
 
 incl = include_directories('include')
 
+install_headers(
+'include/mbedtls/aes.h',
+'include/mbedtls/aria.h',
+'include/mbedtls/asn1.h',
+'include/mbedtls/asn1write.h',
+'include/mbedtls/base64.h',
+'include/mbedtls/bignum.h',
+'include/mbedtls/block_cipher.h',
+'include/mbedtls/build_info.h',
+'include/mbedtls/camellia.h',
+'include/mbedtls/ccm.h',
+'include/mbedtls/chacha20.h',
+'include/mbedtls/chachapoly.h',
+'include/mbedtls/check_config.h',
+'include/mbedtls/cipher.h',
+'include/mbedtls/cmac.h',
+'include/mbedtls/compat-2.x.h',
+'include/mbedtls/config_adjust_legacy_crypto.h',
+'include/mbedtls/config_adjust_legacy_from_psa.h',
+'include/mbedtls/config_adjust_psa_from_legacy.h',
+'include/mbedtls/config_adjust_psa_superset_legacy.h',
+'include/mbedtls/config_adjust_ssl.h',
+'include/mbedtls/config_adjust_x509.h',
+'include/mbedtls/config_psa.h',
+'include/mbedtls/constant_time.h',
+'include/mbedtls/ctr_drbg.h',
+'include/mbedtls/debug.h',
+'include/mbedtls/des.h',
+'include/mbedtls/dhm.h',
+'include/mbedtls/ecdh.h',
+'include/mbedtls/ecdsa.h',
+'include/mbedtls/ecjpake.h',
+'include/mbedtls/ecp.h',
+'include/mbedtls/entropy.h',
+'include/mbedtls/error.h',
+'include/mbedtls/gcm.h',
+'include/mbedtls/hkdf.h',
+'include/mbedtls/hmac_drbg.h',
+'include/mbedtls/lms.h',
+'include/mbedtls/md.h',
+'include/mbedtls/md5.h',
+'include/mbedtls/memory_buffer_alloc.h',
+'include/mbedtls/net_sockets.h',
+'include/mbedtls/nist_kw.h',
+'include/mbedtls/oid.h',
+'include/mbedtls/pem.h',
+'include/mbedtls/pk.h',
+'include/mbedtls/pkcs12.h',
+'include/mbedtls/pkcs5.h',
+'include/mbedtls/pkcs7.h',
+'include/mbedtls/platform.h',
+'include/mbedtls/platform_time.h',
+'include/mbedtls/platform_util.h',
+'include/mbedtls/poly1305.h',
+'include/mbedtls/private_access.h',
+'include/mbedtls/psa_util.h',
+'include/mbedtls/ripemd160.h',
+'include/mbedtls/rsa.h',
+'include/mbedtls/sha1.h',
+'include/mbedtls/sha256.h',
+'include/mbedtls/sha3.h',
+'include/mbedtls/sha512.h',
+'include/mbedtls/ssl.h',
+'include/mbedtls/ssl_cache.h',
+'include/mbedtls/ssl_ciphersuites.h',
+'include/mbedtls/ssl_cookie.h',
+'include/mbedtls/ssl_ticket.h',
+'include/mbedtls/threading.h',
+'include/mbedtls/timing.h',
+'include/mbedtls/version.h',
+'include/mbedtls/x509.h',
+'include/mbedtls/x509_crl.h',
+'include/mbedtls/x509_crt.h',
+'include/mbedtls/x509_csr.h',
+'include/mbedtls/mbedtls_config.h',
+subdir: 'mbedtls')
+install_headers(
+'include/psa/build_info.h',
+'include/psa/crypto.h',
+'include/psa/crypto_adjust_auto_enabled.h',
+'include/psa/crypto_adjust_config_dependencies.h',
+'include/psa/crypto_adjust_config_key_pair_types.h',
+'include/psa/crypto_adjust_config_synonyms.h',
+'include/psa/crypto_builtin_composites.h',
+'include/psa/crypto_builtin_key_derivation.h',
+'include/psa/crypto_builtin_primitives.h',
+'include/psa/crypto_compat.h',
+'include/psa/crypto_config.h',
+'include/psa/crypto_driver_common.h',
+'include/psa/crypto_driver_contexts_composites.h',
+'include/psa/crypto_driver_contexts_key_derivation.h',
+'include/psa/crypto_driver_contexts_primitives.h',
+'include/psa/crypto_extra.h',
+'include/psa/crypto_legacy.h',
+'include/psa/crypto_platform.h',
+'include/psa/crypto_se_driver.h',
+'include/psa/crypto_sizes.h',
+'include/psa/crypto_struct.h',
+'include/psa/crypto_types.h',
+'include/psa/crypto_values.h',
+  subdir:'psa')
+
 libmbedcrypto = library('mbedcrypto',
   'library/aes.c',
   'library/aesni.c',
@@ -143,3 +245,5 @@ mbedtls_dep = declare_dependency(
     include_directories: incl,
 )
 
+pkg = import('pkgconfig')
+pkg.generate(libmbedtls,libraries:[libmbedtls, libmbedx509, libmbedcrypto])