Skip to content

Commit b04f3a6

Browse files
use provided conan profile (#48)
1 parent bd5eb16 commit b04f3a6

File tree

2 files changed

+3
-42
lines changed

2 files changed

+3
-42
lines changed

images/rippled/Dockerfile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,11 @@ WORKDIR /opt/ripple
3232

3333
ENV PATH="/opt/conan_env/bin:$PATH"
3434

35-
# New and improved build process, but is not in latest (2.5.0) release yet
36-
# Move from copying the default profile to using one in
37-
# "/opt/ripple/conan/profiles/default" after it gets integrated
3835
# https://github.com/XRPLF/rippled/blob/develop/BUILD.md
39-
COPY conan_default conan_default
40-
4136
RUN <<-EOF
4237
set -e
4338
git config --global http.postBuffer 1048576000
44-
conan config install conan_default -tf $(conan config home)/profiles
39+
conan config install /opt/ripple/conan/profiles/default -tf $(conan config home)/profiles
4540
conan remote add --index 0 xrplf "https://conan.ripplex.io"
4641
mkdir cmake_build
4742
EOF
@@ -51,8 +46,8 @@ RUN <<-EOF
5146
cd cmake_build
5247
conan install \
5348
.. \
54-
--profile:host=conan_default \
55-
--profile:build=conan_default \
49+
--profile:host=default \
50+
--profile:build=default \
5651
--output-folder . \
5752
--build missing \
5853
--settings build_type=Release

images/rippled/conan_default

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)