Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-13 22:51:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #107 from KalleDK/conan-support

Browse Source 
Added conan support
This commit is contained in:
Matt McCormick 2017-02-02 13:15:56 -05:00 committed by GitHub
commit b2b77f080a
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@ -15,6 +15,7 @@ Features
* Commands in the container are run as the calling user, so that any created files have the expected ownership, (i.e. not root). * Commands in the container are run as the calling user, so that any created files have the expected ownership, (i.e. not root).
* Make variables (`CC`, `LD` etc) are set to point to the appropriate tools in the container. * Make variables (`CC`, `LD` etc) are set to point to the appropriate tools in the container.
* Recent `CMake <https://cmake.org>`_ and ninja are precompiled. * Recent `CMake <https://cmake.org>`_ and ninja are precompiled.
* `Conan.io <https://www.conan.io>`_ can be used as a package manager.
* Toolchain files configured for CMake. * Toolchain files configured for CMake.
* Current directory is mounted as the container's workdir, ``/work``. * Current directory is mounted as the container's workdir, ``/work``.
* Works with the `Docker for Mac <https://docs.docker.com/docker-for-mac/>`_ and `Docker for Windows <https://docs.docker.com/docker-for-windows/>`_. * Works with the `Docker for Mac <https://docs.docker.com/docker-for-mac/>`_ and `Docker for Windows <https://docs.docker.com/docker-for-windows/>`_.

1
common.debian
View File

@ -20,6 +20,7 @@ RUN apt-get update && apt-get install \
pkg-config \ pkg-config \
libtool \ libtool \
python \ python \
python-pip \
rsync \ rsync \
sed \ sed \
bison \ bison \

2
common.docker
View File

@ -26,6 +26,8 @@ RUN \
-python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \ -python $([ -e /opt/python/cp35-cp35m/bin/python ] && echo "/opt/python/cp35-cp35m/bin/python" || echo "python") && \
rm /dockcross/install-ninja.sh rm /dockcross/install-ninja.sh
RUN pip install conan
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
WORKDIR /work WORKDIR /work
ENTRYPOINT ["/dockcross/entrypoint.sh"] ENTRYPOINT ["/dockcross/entrypoint.sh"]