Update to Conan 1.26.x and latest nmos-cpp commit. Testing CMake 3.18…

….0-rc1 aganist Focal container build issues

Dockerfile

@@ -5,7 +5,7 @@ LABEL maintainer="[email protected]"
 ARG makemt
 
 ENV APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=DontWarn \
-    NMOS_CPP_VERSION=f5dce9d6ff6e4dc2b575dc634c1b28f39f6d41bd
+    NMOS_CPP_VERSION=4a51af52ceeebc67fa37a03b609d9a8eb69c6b26
 
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -y --no-install-recommends \
     g++ build-essential \
@@ -19,16 +19,16 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && apt-get install -
     apt-get clean -y --no-install-recommends && \
     apt-get autoclean -y --no-install-recommends
 
-## Get and Make CMake version 3.17.3 (latest when Dockerfile developed) - Adjust as necessary
-RUN cd /home/ && wget --no-check-certificate https://cmake.org/files/v3.17/cmake-3.17.3.tar.gz && \
-    tar xvf cmake-3.17.3.tar.gz && rm cmake-3.17.3.tar.gz && cd /home/cmake-3.17.3 && \
+## Get and Make CMake version 3.18.0 (latest when Dockerfile developed) - Adjust as necessary
+RUN cd /home/ && wget --no-check-certificate https://cmake.org/files/v3.18/cmake-3.18.0-rc1.tar.gz && \
+    tar xvf cmake-3.18.0-rc1.tar.gz && rm cmake-3.18.0-rc1.tar.gz && cd /home/cmake-3.18.0-rc1 && \
     ./bootstrap && \
     if [ -n "$makemt" ]; then echo "Making multi-threaded with $makemt jobs"; make -j$makemt; else echo "Making single-threaded"; make; fi && \
     make install
 
 ## Get Conan and it's dependencies
 RUN cd /home/ && git config --global http.sslVerify false && \
-    git clone --branch release/1.25 https://github.com/conan-io/conan.git && \
+    git clone --branch release/1.26 https://github.com/conan-io/conan.git && \
     cd conan && pip3 install wheel && pip3 install -e . && export PYTHONPATH=$PYTHONPATH:$(pwd) && \
     export PYTHONPATH=$PYTHONPATH:$(pwd)
 
@@ -100,7 +100,7 @@ RUN cd /home/nmos-js/Development && \
 ## Move executables, libraries and clean up container as much as possible
 RUN cd /home/nmos-cpp/Development/build && \
     cp nmos-cpp-node nmos-cpp-registry /home && \
-    cd /home && rm -rf .git conan cmake-3.17.3 nmos-cpp nmos-js nmos-web-router
+    cd /home && rm -rf .git conan cmake-3.18.0-rc1 nmos-cpp nmos-js nmos-web-router
 
 ## Re-build container for optimised runtime environment using clean Ubuntu Bionic release
 FROM ubuntu:bionic