diff --git a/Dockerfile b/Dockerfile index 581ef9fe1718f9f30b2afc1defa76583ed3d3dc2..2515ce008dc21cba49ac9f2ac3fb366c2c166c97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,16 +9,16 @@ ENV DEBIAN_FRONTEND noninteractive RUN apt-get -qq update \ && apt-get -qq -y install --no-install-recommends \ build-essential=12.8ubuntu1.1 \ - git=1:2.25.1-1ubuntu3 \ + git=1:2.25.1-1ubuntu3.1 \ ninja-build=1.10.0-1build1 \ openscad=2019.05-3ubuntu5 \ pkg-config=0.29.1-0ubuntu4 \ python3-pip=20.0.2-5ubuntu1.1 \ python3-venv=3.8.2-0ubuntu2 \ - && apt-get clean && rm -rf /var/lib/apt/lists/* + && apt-get clean && rm -rf /var/lib/apt/lists/* \ -RUN pip3 install --no-cache-dir \ - cmake==3.18.4.post1 \ - conan==1.34.0 + && pip3 install --no-cache-dir \ + cmake==3.18.4.post1 \ + conan==1.35.2 CMD [ "/bin/bash" ] diff --git a/conanfile.py b/conanfile.py index 7d8b6de9c7c2fc6f2bb2521c7f966c63f4c1a9e2..e110b076d3363cbdc9c21e3009f68cc09421e881 100644 --- a/conanfile.py +++ b/conanfile.py @@ -16,8 +16,8 @@ class CsgEbConan(ConanFile): options = {"shared": [True, False]} default_options = {"shared": False} generators = "pkg_config" - requires = ("catch2/2.13.4", "cgal/5.2", "taocpp-pegtl/3.1.0") - build_requires = ("meson/0.57.1",) + requires = ("catch2/2.13.6", "cgal/5.2.1", "taocpp-pegtl/3.2.0") + build_requires = ("meson/0.57.2",) exports_sources = "meson.build", "include/*", "src/*" def build(self):