diff --git a/CHECKSUM_SHA512 b/CHECKSUM_SHA512 index 601bf4f..175dc13 100644 --- a/CHECKSUM_SHA512 +++ b/CHECKSUM_SHA512 @@ -1 +1 @@ -5f756da4d2df59c69997925c69f651011def07bfbdbc582f492ecc19386eee7d79b9951732a792e6041da902d776052d6590cbd2d7004bc93c8406bcf9093fe6 +980dfab33f7ae1dfb2f9e77272d00919224b7d4267d5f9a298ba082779ef5cc10260926dd5ad75f6ff54c1b5f451bbe4ee3d0c3908db5b54b3546cb5e9ec49f6 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4600e3e..684aa8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,11 +32,11 @@ RUN mkdir -p /data ${ELECTRUM_HOME} && \ ENV ELECTRUM_CHECKSUM_SHA512 $CHECKSUM_SHA512 RUN adduser -D $ELECTRUM_USER && \ - apk --no-cache add --virtual build-dependencies gcc musl-dev libsecp256k1 && \ + apk --no-cache add --virtual build-dependencies gcc musl-dev libsecp256k1 libsecp256k1-dev libressl-dev && \ wget https://download.electrum.org/${ELECTRUM_VERSION}/Electrum-${ELECTRUM_VERSION}.tar.gz && \ [ "${ELECTRUM_CHECKSUM_SHA512} Electrum-${ELECTRUM_VERSION}.tar.gz" = "$(sha512sum Electrum-${ELECTRUM_VERSION}.tar.gz)" ] && \ echo -e "**************************\n SHA 512 Checksum OK\n**************************" && \ - pip3 install pycryptodomex Electrum-${ELECTRUM_VERSION}.tar.gz && \ + pip3 install cryptography==2.1.4 pycryptodomex Electrum-${ELECTRUM_VERSION}.tar.gz && \ rm -f Electrum-${ELECTRUM_VERSION}.tar.gz && \ apk del build-dependencies diff --git a/Makefile b/Makefile index 4c138a1..d500e30 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,9 @@ release: docker_tag docker_push output default: docker_build output +download: + @ + docker_build: @docker build \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ diff --git a/docker-compose.yml b/docker-compose.yml index 0e0b518..ae33a70 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,10 @@ services: ports: - 127.0.0.1:7000:7000 environment: - ELECTRUM_USER: electrum - ELECTRUM_PASSWORD: changeme - TESTNET: False + - ELECTRUM_USER=electrum + - ELECTRUM_PASSWORD=changeme + - ELECTRUM_NETWORK=testnet + - ELECTRUM_VERSION=4.2.1 container_name: electrum image: osminogin/docker-electrum-daemon volumes: diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ae94804..c7f7c22 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -2,7 +2,9 @@ set -ex # Network switch -if [ "$TESTNET" = true ] || [ "$ELECTRUM_NETWORK" = "testnet" ]; then +if [ "$ELECTRUM_NETWORK" = "mainnet" ]; then + FLAGS='--mainnet' +elif [ "$ELECTRUM_NETWORK" = "testnet" ]; then FLAGS='--testnet' elif [ "$ELECTRUM_NETWORK" = "regtest" ]; then FLAGS='--regtest'