aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Dockerfile3
-rw-r--r--utils/build_scripts/android32.Dockerfile1
2 files changed, 3 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index c518b5d03..40ba81d9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -112,6 +112,7 @@ RUN set -ex \
WORKDIR /src
COPY . .
+ENV USE_SINGLE_BUILDDIR=1
ARG NPROC
RUN set -ex && \
rm -rf build && \
@@ -128,7 +129,7 @@ RUN set -ex && \
apt-get --no-install-recommends --yes install ca-certificates && \
apt-get clean && \
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
VOLUME /root/.bitmonero
diff --git a/utils/build_scripts/android32.Dockerfile b/utils/build_scripts/android32.Dockerfile
index 2738d8d57..8647341cb 100644
--- a/utils/build_scripts/android32.Dockerfile
+++ b/utils/build_scripts/android32.Dockerfile
@@ -138,4 +138,5 @@ RUN cd /src \
&& CMAKE_INCLUDE_PATH="${PREFIX}/include" \
CMAKE_LIBRARY_PATH="${PREFIX}/lib" \
ANDROID_STANDALONE_TOOLCHAIN_PATH=${TOOLCHAIN_DIR} \
+ USE_SINGLE_BUILDDIR=1 \
PATH=${HOST_PATH} make release-static-android -j${NPROC}