Browse Source

IS WORKKKKK

gamesol 1 tuần trước cách đây
mục cha
commit
a3b8c0e448
3 tập tin đã thay đổi với 11 bổ sung19 xóa
  1. 10 16
      Dockerfile
  2. 1 3
      docker-compose.yml
  3. BIN
      ecoind

+ 10 - 16
Dockerfile

@@ -17,23 +17,18 @@ RUN apt-get update && \
         zlib1g-dev \
         qt5-qmake \
         qtbase5-dev \
-        gcc-aarch64-linux-gnu \
-        g++-aarch64-linux-gnu \
         g++-arm-linux-gnueabihf && \        
     rm -rf /var/lib/apt/lists/*
 COPY ./ecoin /ecoin
 WORKDIR /ecoin
 
-# Build el bootstrap ese.
-# Este mierda de RUN, no se por que coño peta la 1º vez.
-# Pero a mi me va siempre la 2º...
+# Build bootstrap.
 RUN cd /ecoin/src/boost_1_68_0 && \
     ./bootstrap.sh \
 # amr64
-    ./b2 toolset=gcc-arm cxxflags="-march=armv8-a" install --prefix=/usr/local
+#    ./b2 toolset=gcc-arm cxxflags="-march=armv8-a" install --prefix=/usr/local
 # amr32
-#   ./b2 toolset=gcc-arm cxxflags="-march=armv7-a" install --prefix=/usr/local
-
+   ./b2 toolset=gcc-arm cxxflags="-march=armv7-a" install --prefix=/usr/local
 
 # Build leveldb
 RUN cd /ecoin/src \
@@ -45,19 +40,18 @@ RUN cd /ecoin/src \
     cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 .. \
     make -j$(nproc)
 
+# RUN cd /ecoin/src/leveldb && \
+#     TARGET_OS=Linux make libleveldb.a libmemenv.a
+
 # Build qt5 make make
 RUN cd /ecoin && \
 # amr64
-    /usr/lib/aarch64-linux-gnu/qt5/bin/qmake  \
-# amr64
-#    /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake \
+#    /usr/lib/aarch64-linux-gnu/qt5/bin/qmake  \
+# amr32
+    /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake \
         USE_UPNP=- USE_IPV6=- USE_QRCODE=1 \
         -o Makefile ecoin-qt.pro
 
-# RUN cd /ecoin/src/leveldb && \
-#     TARGET_OS=Linux make libleveldb.a libmemenv.a
-
-
 # Build daemon based wallet
 RUN cd /ecoin/src && \
     make \
@@ -66,4 +60,4 @@ RUN cd /ecoin/src && \
     strip ecoind
 
 RUN cp -r /ecoin/src/ecoind /usr/local/bin/ecoind
-RUN export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH && ldconfig
+RUN export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH && ldconfig

+ 1 - 3
docker-compose.yml

@@ -2,9 +2,7 @@ version: '2'
 
 services:
   ecoin:
-    platform: linux/arm64
-    build:
-      context: "."
+    image: ecoin-arm32
     container_name: ecoin  
     hostname: ecoin
     restart: always

BIN
ecoind