diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full index bb717036bd4c4b296771f5e10ba22f6d3d925cba..6268af2eb122d3f454fcc6d3f0e74a50f4dfd07a 100644 --- a/scripts/docker/Dockerfile.clang.full +++ b/scripts/docker/Dockerfile.clang.full @@ -73,12 +73,12 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.16.0 +RUN pip3 install conan==1.17.0 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.16.0 + org.opengeosys.pm.conan.version=1.17.0 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # Include-what-you-use for clang version 7 diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full index 265e52383a768bc55037adb45de85205010f27d9..52b786901d6682842f118d48c725b65c7a8fc46b 100644 --- a/scripts/docker/Dockerfile.gcc.full +++ b/scripts/docker/Dockerfile.gcc.full @@ -66,12 +66,12 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.16.0 +RUN pip3 install conan==1.17.0 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.16.0 + org.opengeosys.pm.conan.version=1.17.0 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # cppcheck version 1.87 diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui index aff24b2d470b351805c820cce0a02a03bb2884b6..dcc34b8ebb82a18731cbb072d49aa8b659b4f86c 100644 --- a/scripts/docker/Dockerfile.gcc.gui +++ b/scripts/docker/Dockerfile.gcc.gui @@ -61,6 +61,7 @@ RUN apt-get update && \ RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ libgl1-mesa-dev \ + libglu1-mesa-dev \ libxt-dev \ mesa-common-dev && \ rm -rf /var/lib/apt/lists/* @@ -73,12 +74,12 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.16.0 +RUN pip3 install conan==1.17.0 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.16.0 + org.opengeosys.pm.conan.version=1.17.0 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # cppcheck version 1.87