diff --git a/Dockerfile b/Dockerfile index 282d5e6..90960de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,11 @@ -FROM phusion/baseimage:0.9.19 +FROM phusion/baseimage:0.11 -ENV BITCOIND_REV master +ARG BITCOIND_REV=master ARG UBUNTU_MIRROR=mirror://mirrors.ubuntu.com/mirrors.txt ARG BITCOIN_REPO=https://github.com/bitcoin/bitcoin.git -RUN sed -i \ - -e s#http://archive.ubuntu.com/ubuntu/#${UBUNTU_MIRROR}#g \ - -e s#http://security.ubuntu.com/ubuntu/#${UBUNTU_MIRROR}#g \ - /etc/apt/sources.list ; \ - cat /etc/apt/sources.list +ADD ./sources.list /etc/apt/sources.list RUN \ apt-get update && \ @@ -42,7 +38,7 @@ RUN \ git checkout $BITCOIND_REV && \ ./autogen.sh && \ ./configure --disable-wallet --enable-hardening && \ - make -j2 && \ + make -j$(nproc --all) && \ make install && \ cd / && \ rm -rf /usr/local/src/bitcoin @@ -72,9 +68,4 @@ EXPOSE 8333 RUN mkdir -p /etc/service/bitcoind ADD bitcoind.run /etc/service/bitcoind/run - -RUN mkdir -p /etc/service/bitcoind/log -ADD bitcoind.log.run /etc/service/bitcoind/log/run - -RUN chmod +x /etc/service/bitcoind/log/run \ - /etc/service/bitcoind/run +RUN chmod +x /etc/service/bitcoind/run diff --git a/README.markdown b/README.markdown index 7d50430..2884761 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,13 @@ # sneak/bitcoind docker image +``` + __ _ __ _ __ + / /_ (_) /__________ (_)___ ____/ / + / __ \/ / __/ ___/ __ \/ / __ \/ __ / + / /_/ / / /_/ /__/ /_/ / / / / / /_/ / +/_.___/_/\__/\___/\____/_/_/ /_/\__,_/ +``` + * supports zmq * wallet support disabled diff --git a/bitcoind.log.run b/bitcoind.log.run deleted file mode 100644 index 6b5d8ce..0000000 --- a/bitcoind.log.run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec chpst -usyslog logger -t bitcoind diff --git a/sources.list b/sources.list new file mode 100644 index 0000000..30e191e --- /dev/null +++ b/sources.list @@ -0,0 +1,4 @@ +deb mirror://mirrors.ubuntu.com/mirrors.txt bionic main universe multiverse restricted +deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-updates main universe multiverse restricted +deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-security main universe multiverse restricted +deb mirror://mirrors.ubuntu.com/mirrors.txt bionic-backports main universe multiverse restricted