diff --git a/Dockerfile b/Dockerfile index 6aa1001..2fff1c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,7 @@ RUN git clone https://github.com/martine/ninja.git && \ cd .. && rm -rf ninja RUN echo "root:root" | chpasswd -WORKDIR /build +WORKDIR /work ENTRYPOINT ["/dockcross/entrypoint.sh"] COPY imagefiles/entrypoint.sh imagefiles/dockcross /dockcross/ diff --git a/README.rst b/README.rst index a995f72..25526be 100644 --- a/README.rst +++ b/README.rst @@ -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). * Make variables (`CC`, `LD` etc) are set to point to the appropriate tools in the container. * Recent `CMake `_ 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). diff --git a/imagefiles/dockcross b/imagefiles/dockcross index 8d248ea..983696f 100755 --- a/imagefiles/dockcross +++ b/imagefiles/dockcross @@ -154,7 +154,7 @@ fi # Now, finally, run the command in a container # docker run -i -t --rm \ - -v $PWD:/build \ + -v $PWD:/work \ $USER_IDS \ $FINAL_ARGS \ $FINAL_IMAGE "$@" diff --git a/linux-arm64/Dockerfile b/linux-arm64/Dockerfile index a7eac1c..f0100e3 100644 --- a/linux-arm64/Dockerfile +++ b/linux-arm64/Dockerfile @@ -35,7 +35,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \ LD=/usr/bin/${CROSS_TRIPLE}-ld ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-arm64 -WORKDIR /build +WORKDIR /work # Note: Toolchain file support is currently in debian Experimental according to: # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 diff --git a/linux-ppc64le/Dockerfile b/linux-ppc64le/Dockerfile index 0250849..fcdebe1 100644 --- a/linux-ppc64le/Dockerfile +++ b/linux-ppc64le/Dockerfile @@ -35,7 +35,7 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \ LD=/usr/bin/${CROSS_TRIPLE}-ld ENV DEFAULT_DOCKCROSS_IMAGE dockcross/linux-ppc64le -WORKDIR /build +WORKDIR /work # Note: Toolchain file support is currently in debian Experimental according to: # https://wiki.debian.org/CrossToolchains#In_jessie_.28Debian_8.29 diff --git a/windows-x64/Dockerfile b/windows-x64/Dockerfile index ed478f0..9916dae 100644 --- a/windows-x64/Dockerfile +++ b/windows-x64/Dockerfile @@ -66,7 +66,7 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \ LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld 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 RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE} diff --git a/windows-x86/Dockerfile b/windows-x86/Dockerfile index d66b330..ff83162 100644 --- a/windows-x86/Dockerfile +++ b/windows-x86/Dockerfile @@ -66,7 +66,7 @@ ENV AS=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-as \ LD=/usr/src/mxe/usr/bin/${CROSS_TRIPLE}-ld 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 RUN echo 'set(CMAKE_CROSSCOMPILING_EMULATOR "/usr/bin/wine")' >> ${CMAKE_TOOLCHAIN_FILE}