Skip to content

Update Dockcross and Conan #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Dockcross and Conan #98

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/io.github.apl_cornell/nativetools/templates/Dockerfile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down