Skip to content
This repository has been archived by the owner on Mar 7, 2023. It is now read-only.

Commit

Permalink
Change Dockerfile for now
Browse files Browse the repository at this point in the history
  • Loading branch information
matsjj committed Oct 27, 2020
1 parent 0f2e47f commit 4ed4b2b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ lib/protobuf
.history/

# Generated files
CMakeFiles
jni/cpp/generated
jni/java/wallet/core/jni
jni/.gradle
jni/*.iml
swift/Sources/Generated
swift/wallet-core/
src/Generated
Expand Down Expand Up @@ -60,3 +63,4 @@ samples/cpp/*.cmake
samples/cpp/sample
compile_commands.json
walletconsole/walletconsole
CMakeCache.txt
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,6 @@ target_include_directories(TrustWalletCore
${CMAKE_CURRENT_SOURCE_DIR}/build/local/include
)

if(NOT ANDROID AND NOT IOS_PLATFORM AND NOT WASM)
add_subdirectory(tests)
add_subdirectory(walletconsole/lib)
add_subdirectory(walletconsole)
endif()

configure_file(${CMAKE_CURRENT_SOURCE_DIR}/swift/cpp.xcconfig.in ${CMAKE_CURRENT_SOURCE_DIR}/swift/cpp.xcconfig @ONLY)

install(TARGETS TrustWalletCore
Expand Down
3 changes: 2 additions & 1 deletion docker/wallet-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ RUN apt-get update \
ninja-build \
pkg-config \
ruby-full \
default-jdk \
&& apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

# Install clang
Expand Down Expand Up @@ -83,4 +82,6 @@ RUN cd /wallet-core \
&& cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug \
&& make -Cbuild -j12

RUN apt-get update && apt-get install -y default-jdk

CMD ["/bin/bash"]

0 comments on commit 4ed4b2b

Please sign in to comment.