simplified regtest

docker/doichain/Dockerfile

@@ -113,7 +113,7 @@ RUN mkdir data && \
 
 #Run entrypoint
 WORKDIR /home/doichain
-ENTRYPOINT ["scripts/entrypoint.sh"]
+#ENTRYPOINT ["scripts/entrypoint.sh"]
 
 #Start doichain and meteor
 CMD ["scripts/start.sh"]

docker/doichain/docker-compose-regtest.yml

@@ -3,28 +3,24 @@ services:
     image: "doichain/core:dc0.20.1.13"
     container_name: regtest
     ports:
-      - "18338:18338"
-      - "18339:18339"
+      - "18332:18332"
+      - "18443:18443"
+      - "18445:18445"
     stdin_open: true
     volumes:
       - ./.doichain/:/home/doichain/.doichain/
-      - ./entrypoint.sh:/home/doichain/scripts/entrypoint.sh
+      - ./doichain-regtest.conf:/home/doichain/data/doichain/doichain.conf
       - ./doichain-start.sh:/home/doichain/scripts/doichain-start.sh
-    environment:
-      - RPC_ALLOW_IP=0.0.0.0/0
-      - RPC_PASSWORD=adminpw
-      - REGTEST=true
     tty: true
     privileged: true
-    entrypoint: "./scripts/entrypoint.sh"
     command: "./scripts/start.sh"
     networks:
       - doichain_regtest-network
 
   electrumx-doi:
     container_name: electrumx-doi
     hostname: electrumx-doi
-    image: "le-space/electrumx:dc1.2.1"
+    image: "doichain/electrumx:dc1.2.1"
     depends_on:
       - regtest
     volumes:

docker/doichain/doichain-regtest.conf

@@ -0,0 +1,28 @@
+regtest=1
+testnet=0
+daemon=1
+server=1
+wallet=1
+rpcuser=admin
+rpcpassword=adminpw
+rpcallowip=0.0.0.0/0
+txindex=1
+fallbackfee=0.0002
+namehistory=1
+rpcworkqueue=100
+blocknotify=curl -X GET http://localhost:3000/api/v1/blocknotify?block=%s
+walletnotify=curl -X GET http://localhost:3000/api/v1/walletnotify?tx=%s
+
+[test]
+rpcport=18332
+rpcbind=0.0.0.0
+rpcallowip=0.0.0.0/0
+wallet=1
+port=18445
+
+[regtest]
+rpcport=18332
+rpcbind=0.0.0.0
+rpcallowip=0.0.0.0/0
+wallet=1
+port=18445

docker/doichain/electrumx/Dockerfile

@@ -29,4 +29,5 @@ WORKDIR /electrumx
 # Start ElectrumX server.
 ENTRYPOINT ["./electrumx_server"]
 
-RUN rm -rf /var/lib/apt/lists/*
+# Safely remove the apt lists if they exist
+RUN [ -d /var/lib/apt/lists ] && rm -rf /var/lib/apt/lists/* || true