Skip to content

Commit

Permalink
Merge pull request #3728 from conan-io/release/2.3
Browse files Browse the repository at this point in the history
sync develop2 with release/2.3
  • Loading branch information
czoido authored May 16, 2024
2 parents 3cf2a48 + 27cd049 commit 92e81a3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions examples/cross_build/toolchain_packages.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Please, first clone the sources to recreate this project. You can find them in t
Here, you will find a Conan recipe (and the *test_package*) to package an ARM toolchain
for cross-compiling to Linux ARM for both 32 and 64 bits. To simplify a bit, we are
assuming that we can just cross-build from Linux x86_64 to Linux ARM, both 32 and 64 bits.
If you're looking for another example, you can explore an additional MacOs to Linux cross-build example right
`here <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_ .

.. code-block:: bash
Expand Down Expand Up @@ -485,3 +487,4 @@ architecture of the resulting executable, confirming its alignment with the targ

- :ref:`More info on settings_target<binary_model_extending_cross_build_target_settings>`
- :ref:`Cross-compile your applications using Conan<consuming_packages_cross_building_with_conan>`
- `Another example of cross-compilation from Macos to Linux <https://github.com/conan-io/examples2/tree/main/examples/cross_build/toolchain_packages/toolchain_macos_linux_cross>`_
6 changes: 5 additions & 1 deletion reference/runners/docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ If you need more control over the build and execution of the container, you can
How to run a `conan create` in a runner
---------------------------------------

.. note::

The docker runner feature is only supported by ``conan create`` command. The ``conan install --build`` command is not supported.

In the following links you can find some examples about how to use a conan docker runner:

- :ref:`Creating a Conan package using a Docker runner<examples_runners_docker_basic>`
- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`
- :ref:`Using a docker runner configfile to parameterize the Dockerfile base image<examples_runners_docker_configfile_build_args>`

0 comments on commit 92e81a3

Please sign in to comment.