maxmind преди 8 месеца
родител
ревизия
005bb895ad
променени са 3 файла, в които са добавени 7 реда и са изтрити 30 реда
  1. 2 3
      Dockerfile
  2. 2 26
      docker-compose.yml
  3. 3 1
      entrypoint.sh

+ 2 - 3
Dockerfile

@@ -6,8 +6,7 @@ WORKDIR /app
 
 RUN git clone https://github.com/zorp-corp/nockchain.git && \
     cd nockchain && \
-    make install-choo && \
-    make build-hoon-all && \
+    make install-hoonc && \
     make build
 
 FROM debian:bullseye-slim
@@ -15,7 +14,7 @@ FROM debian:bullseye-slim
 RUN apt update && apt install -y ca-certificates && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /app/nockchain/target/release/nockchain /app/bin/
-COPY --from=builder /app/nockchain/target/release/wallet /app/wallet/
+COPY --from=builder /app/nockchain/target/release/nockchain-wallet /app/wallet/
 
 WORKDIR /app/data
 

+ 2 - 26
docker-compose.yml

@@ -1,34 +1,10 @@
 services:
-  nockchain-leader:
+  nockchain:
     image: ghcr.io/lushdog/nockchain:latest
     network_mode: host
     privileged: true
     volumes:
-      - ./nockchain-leader:/app/data
-      - ./wallet:/app/wallet/.data.wallet
-    environment:
-      - MINING_PUBKEY=${MINING_PUBKEY:?please make sure to set your MINING_PUBKEY environment variable in the .env file}
-    command:
-      - "--fakenet"
-      - "--genesis-leader"
-      - "--npc-socket"
-      - "nockchain.sock"
-      - "--mining-pubkey"
-      - "${MINING_PUBKEY}"
-      - "--bind"
-      - "/ip4/0.0.0.0/udp/3005/quic-v1"
-      - "--peer"
-      - "/ip4/127.0.0.1/udp/3006/quic-v1"
-      - "--new-peer-id"
-      - "--no-default-peers"
-    restart: unless-stopped
-
-  nockchain-follower:
-    image: ghcr.io/lushdog/nockchain:latest
-    network_mode: host
-    privileged: true
-    volumes:
-      - ./nockchain-follower:/app/data
+      - ./nockchain:/app/data
       - ./wallet:/app/wallet/.data.wallet
     environment:
       - MINING_PUBKEY=${MINING_PUBKEY:?please make sure to set your MINING_PUBKEY environment variable in the .env file}

+ 3 - 1
entrypoint.sh

@@ -2,7 +2,9 @@
 
 echo "starting nockchain with $@"
 
-export RUST_LOG=info
+export RUST_BACKTRACE=full
+export RUST_LOG=info,nockchain=debug,nockchain_libp2p_io=info,libp2p=info,libp2p_quic=info
+export MINIMAL_LOG_FORMAT=true
 
 rm -f nockchain.sock