mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-12-22 08:24:25 +01:00
Dockerfiles: Rename working directory from "/build" to "/work"
Since the directory will contain both sources and build, this commit generalizes its name.
This commit is contained in:
parent
414812088c
commit
96f3514bf2
@ -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/
|
||||
|
@ -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 <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).
|
||||
|
||||
|
||||
|
@ -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 "$@"
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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}
|
||||
|
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user