Merge branch 'owneps'

README.md

@@ -324,6 +324,7 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) |
 | btcpayserver/btctransmuter | 0.0.49 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.49/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.49/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.49/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) |
 | btcpayserver/btcpayserver-configurator | 0.0.18 | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.18/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.18/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btcpayserver-configurator/v0.0.18/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btcpayserver-configurator) - [DockerHub](https://hub.docker.com/r/btcpayserver/btcpayserver-configurator) |
+| btcpayserver/eps | 0.2.0 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/eps) |
 | btcpayserver/tor | 0.4.1.5 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Tor/0.4.1.5/Tor/0.4.1.5/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/tor) |
 | postgres | 9.6.5 | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [✔️](https://raw.githubusercontent.com/docker-library/postgres/b7cb3c6eacea93be2259381033be3cc435649369/9.6/Dockerfile) | [Github](https://github.com/docker-library/postgres) - [DockerHub](https://hub.docker.com/_/postgres) |
 | kamigawabul/docker-bitcoingold | 0.15.2 | [✔️](https://raw.githubusercontent.com/Vutov/docker-bitcoin/master/bitcoingold/0.15.2/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Vutov/docker-bitcoin) - [DockerHub](https://hub.docker.com/r/kamigawabul/docker-bitcoingold) |
@@ -345,7 +346,6 @@ We are trying to update our dependencies to run on `arm32v7` and `x64` boards. H
 | kukks/monero | v0.15.0.0 | [✔️](https://raw.githubusercontent.com/Kukks/monero-docker/x86_64/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/Kukks/monero-docker) - [DockerHub](https://hub.docker.com/r/kukks/monero) |
 | jvandrew/btcqbo | 0.3.36 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/btcqbo/v0.3.36/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/btcqbo) - [DockerHub](https://hub.docker.com/r/jvandrew/btcqbo) |
 | redis | 5.0.2-alpine | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) |
-| docker.io/peleion/eps-docker | latest | [✔️](https://raw.githubusercontent.com/peleion/eps-docker/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/peleion/eps-docker) - [DockerHub](https://hub.docker.com/r/docker.io/peleion/eps-docker) |
 | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) |
 | jvandrew/librepatron | 0.7.39 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/patron/v0.7.39/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/patron) - [DockerHub](https://hub.docker.com/r/jvandrew/librepatron) |
 | jvandrew/isso | atron.22 | [✔️](https://raw.githubusercontent.com/JeffVandrewJr/isso/patron.22/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/JeffVandrewJr/isso) - [DockerHub](https://hub.docker.com/r/jvandrew/isso) |

contrib/DockerFileBuildHelper/Program.cs

@@ -232,10 +232,13 @@ namespace DockerFileBuildHelper
         retry:
             switch (name)
             {
-                case "peleion/eps-docker":
+                case "eps":
-                    dockerInfo.DockerFilePath = "Dockerfile";
+                    dockerInfo.DockerFilePath = $"EPS/{NoRevision(image.Tag)}/linuxamd64.Dockerfile";
-                    dockerInfo.GitLink = "https://github.com/peleion/eps-docker";
+                    dockerInfo.DockerFilePathARM32v7 = $"EPS/{NoRevision(image.Tag)}/linuxarm32v7.Dockerfile";
-                    dockerInfo.GitRef = "master";
+                    dockerInfo.DockerFilePathARM64v8 = $"EPS/{NoRevision(image.Tag)}/linuxarm64v8.Dockerfile";
+                    dockerInfo.GitLink = "https://github.com/btcpayserver/dockerfile-deps";
+                    dockerInfo.GitRef = $"EPS/{image.Tag}";
+                    dockerInfo.SupportedByUs = true;
                     break;
                 case "btglnd":
                     dockerInfo.DockerFilePath = "Dockerfile";

contrib/build-all-images.sh

@@ -559,15 +559,19 @@ docker build -f "$DOCKERFILE" -t "btcpayserver/btcpayserver-configurator:0.0.18"
 cd - && cd ..
 
 
-# Build peleion/eps-docker
+# Build eps
-# https://raw.githubusercontent.com/peleion/eps-docker/master/Dockerfile
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxamd64.Dockerfile
-DOCKERFILE="Dockerfile"
+DOCKERFILE="EPS/0.2.0/linuxamd64.Dockerfile"
-echo "Building docker.io/peleion/eps-docker:latest"
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm32v7.Dockerfile
-git clone https://github.com/peleion/eps-docker peleion/eps-docker
+[[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="EPS/0.2.0/linuxarm32v7.Dockerfile"
-cd peleion/eps-docker
+# https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/EPS/0.2.0/EPS/0.2.0/linuxarm64v8.Dockerfile
-git checkout master
+[[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="EPS/0.2.0/linuxarm64v8.Dockerfile"
-cd "$(dirname $DOCKERFILE)"
+echo "Building btcpayserver/eps:0.2.0"
-docker build -f "$DOCKERFILE" -t "docker.io/peleion/eps-docker:latest" .
+git clone https://github.com/btcpayserver/dockerfile-deps eps
+cd eps
+git checkout EPS/0.2.0
+cd "$(dirname $DOCKERFILE)"
+docker build -f "$DOCKERFILE" -t "btcpayserver/eps:0.2.0" .
 cd - && cd ..
 
 

docker-compose-generator/docker-fragments/opt-add-electrum-ps.yml

@@ -6,18 +6,34 @@ services:
       BITCOIN_EXTRA_ARGS: |
         rpcauth=eps:3d1cff5ee81ddeb3ba94483150310e74$$4626aeb95b2a2b066eac8833c1ad936f65cf7492aa836ec8f173ff65ac428a0e
   electrum_ps:
-    image: docker.io/peleion/eps-docker
+    image: btcpayserver/eps:0.2.0
     restart: unless-stopped
     ports:
       - "50002:50002"
-    volumes:
-      - "electrum_ps_datadir:/srv"
     environment:
-      - HOST=bitcoind
+      READY_FILE: /root/.nbxplorer/btc_fully_synched
-      - PORT=43782
+      EPS_CONFIG: |
-      - RPC_USER=eps
+        [master-public-keys]
-      - RPC_PASSWORD=cmhKyeLSco35KVhecK3blYcHFx73xrJ1fOQtjtmiKks
+        wallet = ${EPS_XPUB}
-      - XPUB=${EPS_XPUB}
+        [bitcoin-rpc]
+        host = bitcoind
+        port = 43782
+        rpc_user = eps
+        rpc_password = cmhKyeLSco35KVhecK3blYcHFx73xrJ1fOQtjtmiKks
+        poll_interval_listening = 600
+        poll_interval_connected = 5
+        initial_import_count = 1000
+        gap_limit = 25
+        wallet_filename =
+        [electrum-server]
+        host = 0.0.0.0
+        port = 50002
+        broadcast_method = own-node
+        ip_whitelist = *
+        disable_mempool_fee_histogram = false
+    volumes:
+      - "electrum_ps_datadir:/data"
+      - "nbxplorer_datadir:/root/.nbxplorer"
 volumes:
   electrum_ps_datadir:
   

docker-compose-generator/docker-fragments/opt-add-tor.yml

@@ -147,6 +147,12 @@ services:
       - "tor_datadir:/home/tor/.tor"
       - "tor_servicesdir:/var/lib/tor/hidden_services"
 
+  electrum_ps:
+    environment:
+      HIDDENSERVICE_NAME: btc-electrum-ps
+      HIDDENSERVICE_PORT: 50002
+      HIDDENSERVICE_VIRTUAL_PORT: 50002
+
   electrumx:
     environment:
       HIDDENSERVICE_NAME: electrumx