From 419f63674fc1a445c955f65b721a11114870b21b Mon Sep 17 00:00:00 2001 From: Cosku Acay Date: Fri, 27 May 2022 16:00:42 -0700 Subject: [PATCH] Update Dockcross and Conan --- .../io.github.apl_cornell/nativetools/templates/Dockerfile.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt index 31dabf9..edf89c6 100644 --- a/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt +++ b/buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt @@ -32,7 +32,7 @@ internal val linuxDockerfile = Platform.LINUX_64.let { platform -> ${swigDockerfile.include(this)} # Build for Linux - FROM dockcross/manylinux2014-x64:20220104-7777520 as ${platform.safeName} + FROM dockcross/manylinux2014-x64:20220525-334924d as ${platform.safeName} CMD ["/bin/bash"] ## Configure Conan @@ -62,7 +62,7 @@ internal val macosDockerfile = Platform.MACOS_64.let { platform -> && rm -rf /var/lib/apt/lists/* ## Install Conan - RUN wget --quiet https://github.com/conan-io/conan/releases/download/1.44.1/conan-ubuntu-64.deb -O conan.deb \ + RUN wget --quiet https://github.com/conan-io/conan/releases/download/1.48.1/conan-ubuntu-64.deb -O conan.deb \ && dpkg -i conan.deb \ && rm conan.deb