rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-29 18:53:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4419

Browse source 
936e22a9 Dockerfile: use single build dir (MoroccanMalinois)
This commit is contained in:
Riccardo Spagni 2018-09-25 12:05:23 +02:00
commit c1182e433e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -112,6 +112,7 @@ RUN set -ex \
WORKDIR /src WORKDIR /src
COPY . . COPY . .
ENV USE_SINGLE_BUILDDIR=1
ARG NPROC ARG NPROC
RUN set -ex && \ RUN set -ex && \
rm -rf build && \ rm -rf build && \
@ -128,7 +129,7 @@ RUN set -ex && \
apt-get --no-install-recommends --yes install ca-certificates && \ apt-get --no-install-recommends --yes install ca-certificates && \
apt-get clean && \ apt-get clean && \
rm -rf /var/lib/apt rm -rf /var/lib/apt
COPY --from=builder /src/build/Linux/master/release/* /usr/local/bin/ COPY --from=builder /src/build/release/bin /usr/local/bin/
# Contains the blockchain # Contains the blockchain
VOLUME /root/.bitmonero VOLUME /root/.bitmonero

1
utils/build_scripts/android32.Dockerfile
View file

@ -138,4 +138,5 @@ RUN cd /src \
&& CMAKE_INCLUDE_PATH="${PREFIX}/include" \ && CMAKE_INCLUDE_PATH="${PREFIX}/include" \
CMAKE_LIBRARY_PATH="${PREFIX}/lib" \ CMAKE_LIBRARY_PATH="${PREFIX}/lib" \
ANDROID_STANDALONE_TOOLCHAIN_PATH=${TOOLCHAIN_DIR} \ ANDROID_STANDALONE_TOOLCHAIN_PATH=${TOOLCHAIN_DIR} \
USE_SINGLE_BUILDDIR=1 \
PATH=${HOST_PATH} make release-static-android -j${NPROC} PATH=${HOST_PATH} make release-static-android -j${NPROC}