Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-09 20:57:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12 from jcfr/rename-workdir

Browse Source 
Rename workdir
This commit is contained in:
Matt McCormick 2016-07-16 01:13:31 -04:00 committed by GitHub
commit c351b4a3ad
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -69,7 +69,7 @@ RUN git clone https://github.com/martine/ninja.git && \
cd .. && rm -rf ninja cd .. && rm -rf ninja
RUN echo "root:root" | chpasswd RUN echo "root:root" | chpasswd
WORKDIR /build WORKDIR /work
ENTRYPOINT ["/dockcross/entrypoint.sh"] ENTRYPOINT ["/dockcross/entrypoint.sh"]
COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/ COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/

2
README.rst
View File

@ -11,7 +11,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. Toolchain files available for CMake. * Recent `CMake <https://cmake.org>`_ and ninja are precompiled. Toolchain files available for CMake.
* Current directory is mounted as the container's workdir, ``/build``. * Current directory is mounted as the container's workdir, ``/work``.
* Works with boot2docker on OSX and Docker for Mac beta (1.11.1-beta12). * Works with boot2docker on OSX and Docker for Mac beta (1.11.1-beta12).

2
imagefiles/dockcross
View File

@ -154,7 +154,7 @@ fi
# Now, finally, run the command in a container # Now, finally, run the command in a container
# #
docker run -i -t --rm \ docker run -i -t --rm \
-v $PWD:/build \ -v $PWD:/work \
$USER_IDS \ $USER_IDS \
$FINAL_ARGS \ $FINAL_ARGS \
$FINAL_IMAGE "$@" $FINAL_IMAGE "$@"

2
linux-arm64/Dockerfile
View File

@ -35,7 +35,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
LD=/usr/bin/${CROSS_TRIPLE}-ld LD=/usr/bin/${CROSS_TRIPLE}-ld
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64
WORKDIR /build WORKDIR /work
# Note: Toolchain file support is currently in debian Experimental according to: # Note: Toolchain file support is currently in debian Experimental according to:
# https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29

2
linux-ppc64le/Dockerfile
View File

@ -35,7 +35,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
LD=/usr/bin/${CROSS_TRIPLE}-ld LD=/usr/bin/${CROSS_TRIPLE}-ld
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-ppc64le ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-ppc64le
WORKDIR /build WORKDIR /work
# Note: Toolchain file support is currently in debian Experimental according to: # Note: Toolchain file support is currently in debian Experimental according to:
# https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29

2
windows-x64/Dockerfile
View File

@ -66,7 +66,7 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x64 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x64
WORKDIR /build WORKDIR /work
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/x86_64-w64-mingw32.static/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/x86_64-w64-mingw32.static/share/cmake/mxe-conf.cmake
RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}

2
windows-x86/Dockerfile
View File

@ -66,7 +66,7 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \
LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld
ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x86 ENV DEFAULT_DOCKCROSS_IMAGE dockcross/windows-x86
WORKDIR /build WORKDIR /work
ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake ENV CMAKE_TOOLCHAIN_FILE /usr/src/mxe/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake
RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}