Merge pull request #17 from seegno/enhancement/minor-cosmetic-improvements

Minor cosmetic improvements
This commit is contained in:
Tiago Ribeiro 2016-03-07 20:19:43 +00:00
commit 4052087433
7 changed files with 87 additions and 103 deletions

View File

@ -2,9 +2,8 @@ after_script:
- docker images - docker images
before_script: before_script:
- env | sort
- cd "$VERSION" - cd "$VERSION"
- image="bitcoind:$VERSION" - IMAGE="bitcoind:$VERSION"
env: env:
- VERSION=0.12 - VERSION=0.12
@ -15,7 +14,7 @@ env:
language: bash language: bash
script: script:
- docker build -t "$image" . - docker build -t "$IMAGE" .
- docker run "$image" --version | grep "Bitcoin Core" - docker run "$IMAGE" --version | grep "Bitcoin Core"
services: docker services: docker

View File

@ -2,9 +2,9 @@ FROM debian:latest
MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho) MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho)
RUN groupadd -r bitcoin && useradd -r -g bitcoin bitcoin RUN useradd -r bitcoin
ENV GOSU_VERSION "1.7" ENV GOSU_VERSION=1.7
RUN apt-get update -y \ RUN apt-get update -y \
&& apt-get install -y curl \ && apt-get install -y curl \
@ -13,23 +13,23 @@ RUN apt-get update -y \
RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture)" \ RUN curl -o /usr/local/bin/gosu -fSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture) \
&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture).asc" \ && curl -o /usr/local/bin/gosu.asc -fSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture).asc \
&& gpg --verify /usr/local/bin/gosu.asc \ && gpg --verify /usr/local/bin/gosu.asc \
&& rm /usr/local/bin/gosu.asc \ && rm /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu && chmod +x /usr/local/bin/gosu
ENV BITCOIN_DATA /home/bitcoin/.bitcoin ENV BITCOIN_VERSION=0.11.2
ENV BITCOIN_VERSION 0.11.2 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin \
ENV PATH /opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
RUN curl -SL https://bitcoin.org/laanwj-releases.asc | gpg --import \ RUN curl -SL https://bitcoin.org/laanwj-releases.asc | gpg --import \
&& curl -SLO "https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS.asc" \ && curl -SLO https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS.asc \
&& curl -SLO "https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-linux64.tar.gz" \ && curl -SLO https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-linux64.tar.gz \
&& gpg --verify SHA256SUMS.asc \ && gpg --verify SHA256SUMS.asc \
&& grep " bitcoin-${BITCOIN_VERSION}-linux64.tar.gz\$" SHA256SUMS.asc | sha256sum -c - \ && grep " bitcoin-${BITCOIN_VERSION}-linux64.tar.gz\$" SHA256SUMS.asc | sha256sum -c - \
&& tar -xzf "bitcoin-${BITCOIN_VERSION}-linux64.tar.gz" -C /opt \ && tar -xzf bitcoin-${BITCOIN_VERSION}-linux64.tar.gz -C /opt \
&& rm "bitcoin-${BITCOIN_VERSION}-linux64.tar.gz" SHA256SUMS.asc && rm bitcoin-${BITCOIN_VERSION}-linux64.tar.gz SHA256SUMS.asc
VOLUME ["/home/bitcoin/.bitcoin"] VOLUME ["/home/bitcoin/.bitcoin"]

View File

@ -2,37 +2,36 @@ FROM alpine:latest
MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho) MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho)
RUN set -eof pipefail RUN adduser -S bitcoin
RUN addgroup bitcoin && adduser -S -G bitcoin bitcoin ENV GOSU_VERSION=1.7 \
GOSU_SHASUM="34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50 /usr/local/bin/gosu"
ENV GOSU_VERSION "1.7"
ENV GOSU_SHASUM "34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50 /usr/local/bin/gosu"
RUN apk --no-cache add openssl \ RUN apk --no-cache add openssl \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64" \ && wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 \
&& echo "${GOSU_SHASUM}" | sha256sum -c \ && echo "${GOSU_SHASUM}" | sha256sum -c \
&& chmod +x /usr/local/bin/gosu && chmod +x /usr/local/bin/gosu
ENV BERKELEYDB_VERSION "db-4.8.30.NC" ENV BERKELEYDB_VERSION=db-4.8.30.NC
ENV BERKELEYDB_PREFIX "/opt/${BERKELEYDB_VERSION}" ENV BERKELEYDB_PREFIX=/opt/${BERKELEYDB_VERSION}
ENV BITCOIN_VERSION "0.11.2"
ENV BITCOIN_PREFIX "/opt/bitcoin-${BITCOIN_VERSION}" ENV BITCOIN_VERSION=0.11.2
ENV BITCOIN_SHASUM "aab2cd0c4f045970d259cf9fcee5785b43180d20ccbbedc1f90480e697696b25 v${BITCOIN_VERSION}.tar.gz" ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION} \
ENV BITCOIN_DATA "/home/bitcoin/.bitcoin" BITCOIN_SHASUM="aab2cd0c4f045970d259cf9fcee5785b43180d20ccbbedc1f90480e697696b25 v${BITCOIN_VERSION}.tar.gz" \
ENV PATH "${BITCOIN_PREFIX}/bin:$PATH" BITCOIN_DATA=/home/bitcoin/.bitcoin
ENV PATH=${BITCOIN_PREFIX}/bin:$PATH
RUN apk --no-cache --virtual build-dependendencies add autoconf \ RUN apk --no-cache --virtual build-dependendencies add autoconf \
automake \ automake \
boost-dev \ boost-dev \
build-base \ build-base \
chrpath \ chrpath \
libevent-dev \ libevent-dev \
libtool \ libtool \
linux-headers \ linux-headers \
openssl-dev \ openssl-dev \
protobuf-dev \ protobuf-dev \
zeromq-dev \ zeromq-dev \
&& mkdir -p /tmp/build \ && mkdir -p /tmp/build \
&& wget -O /tmp/build/${BERKELEYDB_VERSION}.tar.gz "http://download.oracle.com/berkeley-db/${BERKELEYDB_VERSION}.tar.gz" \ && wget -O /tmp/build/${BERKELEYDB_VERSION}.tar.gz "http://download.oracle.com/berkeley-db/${BERKELEYDB_VERSION}.tar.gz" \
&& tar -xzf "/tmp/build/${BERKELEYDB_VERSION}.tar.gz" -C /tmp/build/ \ && tar -xzf "/tmp/build/${BERKELEYDB_VERSION}.tar.gz" -C /tmp/build/ \

View File

@ -2,9 +2,9 @@ FROM debian:latest
MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho) MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho)
RUN groupadd -r bitcoin && useradd -r -g bitcoin bitcoin RUN useradd -r bitcoin
ENV GOSU_VERSION "1.7" ENV GOSU_VERSION=1.7
RUN apt-get update -y \ RUN apt-get update -y \
&& apt-get install -y curl \ && apt-get install -y curl \
@ -13,23 +13,23 @@ RUN apt-get update -y \
RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
RUN curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture)" \ RUN curl -o /usr/local/bin/gosu -fSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture) \
&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture).asc" \ && curl -o /usr/local/bin/gosu.asc -fSL https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-$(dpkg --print-architecture).asc \
&& gpg --verify /usr/local/bin/gosu.asc \ && gpg --verify /usr/local/bin/gosu.asc \
&& rm /usr/local/bin/gosu.asc \ && rm /usr/local/bin/gosu.asc \
&& chmod +x /usr/local/bin/gosu && chmod +x /usr/local/bin/gosu
ENV BITCOIN_DATA /home/bitcoin/.bitcoin ENV BITCOIN_VERSION=0.12.0
ENV BITCOIN_VERSION 0.12.0 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin \
ENV PATH /opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
RUN curl -SL https://bitcoin.org/laanwj-releases.asc | gpg --import \ RUN curl -SL https://bitcoin.org/laanwj-releases.asc | gpg --import \
&& curl -SLO "https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS.asc" \ && curl -SLO https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS.asc \
&& curl -SLO "https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-linux64.tar.gz" \ && curl -SLO https://bitcoin.org/bin/bitcoin-core-${BITCOIN_VERSION}/bitcoin-${BITCOIN_VERSION}-linux64.tar.gz \
&& gpg --verify SHA256SUMS.asc \ && gpg --verify SHA256SUMS.asc \
&& grep " bitcoin-${BITCOIN_VERSION}-linux64.tar.gz\$" SHA256SUMS.asc | sha256sum -c - \ && grep " bitcoin-${BITCOIN_VERSION}-linux64.tar.gz\$" SHA256SUMS.asc | sha256sum -c - \
&& tar -xzf "bitcoin-${BITCOIN_VERSION}-linux64.tar.gz" -C /opt \ && tar -xzf bitcoin-${BITCOIN_VERSION}-linux64.tar.gz -C /opt \
&& rm "bitcoin-${BITCOIN_VERSION}-linux64.tar.gz" SHA256SUMS.asc && rm bitcoin-${BITCOIN_VERSION}-linux64.tar.gz SHA256SUMS.asc
VOLUME ["/home/bitcoin/.bitcoin"] VOLUME ["/home/bitcoin/.bitcoin"]

View File

@ -2,53 +2,52 @@ FROM alpine:latest
MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho) MAINTAINER Rui Marinho <rui.marinho@seegno.com> (@ruimarinho)
RUN set -eof pipefail RUN adduser -S bitcoin
RUN addgroup bitcoin && adduser -S -G bitcoin bitcoin ENV GOSU_VERSION=1.7 \
GOSU_SHASUM="34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50 /usr/local/bin/gosu"
ENV GOSU_VERSION "1.7"
ENV GOSU_SHASUM "34049cfc713e8b74b90d6de49690fa601dc040021980812b2f1f691534be8a50 /usr/local/bin/gosu"
RUN apk --no-cache add openssl \ RUN apk --no-cache add openssl \
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64" \ && wget -O /usr/local/bin/gosu https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-amd64 \
&& echo "${GOSU_SHASUM}" | sha256sum -c \ && echo "${GOSU_SHASUM}" | sha256sum -c \
&& chmod +x /usr/local/bin/gosu && chmod +x /usr/local/bin/gosu
ENV BERKELEYDB_VERSION "db-4.8.30.NC" ENV BERKELEYDB_VERSION=db-4.8.30.NC
ENV BERKELEYDB_PREFIX "/opt/${BERKELEYDB_VERSION}" ENV BERKELEYDB_PREFIX=/opt/${BERKELEYDB_VERSION}
ENV BITCOIN_VERSION "0.12.0"
ENV BITCOIN_PREFIX "/opt/bitcoin-${BITCOIN_VERSION}" ENV BITCOIN_VERSION=0.12.0
ENV BITCOIN_SHASUM "92b1b6e1f49e74c914ff3dd43e97bb1859bcd3239310b5fe54db326aba1fd0a5 v${BITCOIN_VERSION}.tar.gz" ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION} \
ENV BITCOIN_DATA "/home/bitcoin/.bitcoin" BITCOIN_SHASUM="92b1b6e1f49e74c914ff3dd43e97bb1859bcd3239310b5fe54db326aba1fd0a5 v${BITCOIN_VERSION}.tar.gz" \
ENV PATH "${BITCOIN_PREFIX}/bin:$PATH" BITCOIN_DATA=/home/bitcoin/.bitcoin
ENV PATH=${BITCOIN_PREFIX}/bin:$PATH
RUN apk --no-cache --virtual build-dependendencies add autoconf \ RUN apk --no-cache --virtual build-dependendencies add autoconf \
automake \ automake \
boost-dev \ boost-dev \
build-base \ build-base \
chrpath \ chrpath \
libevent-dev \ libevent-dev \
libtool \ libtool \
linux-headers \ linux-headers \
openssl-dev \ openssl-dev \
protobuf-dev \ protobuf-dev \
zeromq-dev \ zeromq-dev \
&& mkdir -p /tmp/build \ && mkdir -p /tmp/build \
&& wget -O /tmp/build/${BERKELEYDB_VERSION}.tar.gz "http://download.oracle.com/berkeley-db/${BERKELEYDB_VERSION}.tar.gz" \ && wget -O /tmp/build/${BERKELEYDB_VERSION}.tar.gz http://download.oracle.com/berkeley-db/${BERKELEYDB_VERSION}.tar.gz \
&& tar -xzf "/tmp/build/${BERKELEYDB_VERSION}.tar.gz" -C /tmp/build/ \ && tar -xzf /tmp/build/${BERKELEYDB_VERSION}.tar.gz -C /tmp/build/ \
&& sed s/__atomic_compare_exchange/__atomic_compare_exchange_db/g -i "/tmp/build/${BERKELEYDB_VERSION}/dbinc/atomic.h" \ && sed s/__atomic_compare_exchange/__atomic_compare_exchange_db/g -i /tmp/build/${BERKELEYDB_VERSION}/dbinc/atomic.h \
&& mkdir -p "${BERKELEYDB_PREFIX}" \ && mkdir -p ${BERKELEYDB_PREFIX} \
&& cd "/tmp/build/${BERKELEYDB_VERSION}/build_unix" \ && cd /tmp/build/${BERKELEYDB_VERSION}/build_unix \
&& ../dist/configure --enable-cxx --disable-shared --with-pic --prefix="${BERKELEYDB_PREFIX}" \ && ../dist/configure --enable-cxx --disable-shared --with-pic --prefix=${BERKELEYDB_PREFIX} \
&& make install \ && make install \
&& wget -O "/tmp/build/v${BITCOIN_VERSION}.tar.gz" "https://github.com/bitcoin/bitcoin/archive/v${BITCOIN_VERSION}.tar.gz" \ && wget -O /tmp/build/v${BITCOIN_VERSION}.tar.gz https://github.com/bitcoin/bitcoin/archive/v${BITCOIN_VERSION}.tar.gz \
&& cd /tmp/build \ && cd /tmp/build \
&& echo "${BITCOIN_SHASUM}" | sha256sum -c \ && echo "${BITCOIN_SHASUM}" | sha256sum -c \
&& tar -xzf v${BITCOIN_VERSION}.tar.gz \ && tar -xzf v${BITCOIN_VERSION}.tar.gz \
&& cd "/tmp/build/bitcoin-${BITCOIN_VERSION}" \ && cd /tmp/build/bitcoin-${BITCOIN_VERSION} \
&& ./autogen.sh \ && ./autogen.sh \
&& ./configure LDFLAGS="-L${BERKELEYDB_PREFIX}/lib/" CPPFLAGS="-I${BERKELEYDB_PREFIX}/include/" \ && ./configure LDFLAGS=-L${BERKELEYDB_PREFIX}/lib/ CPPFLAGS=-I${BERKELEYDB_PREFIX}/include/ \
--prefix="${BITCOIN_PREFIX}" \ --prefix=${BITCOIN_PREFIX} \
--mandir=/usr/share/man \ --mandir=/usr/share/man \
--disable-tests \ --disable-tests \
--disable-bench \ --disable-bench \
@ -59,8 +58,8 @@ RUN apk --no-cache --virtual build-dependendencies add autoconf \
--with-daemon \ --with-daemon \
&& make install \ && make install \
&& cd / \ && cd / \
&& strip "${BITCOIN_PREFIX}/bin/bitcoin-cli" "${BITCOIN_PREFIX}/bin/bitcoind" "${BITCOIN_PREFIX}/bin/bitcoin-tx" "${BITCOIN_PREFIX}/lib/libbitcoinconsensus.a" "${BITCOIN_PREFIX}/lib/libbitcoinconsensus.so.0.0.0" \ && strip ${BITCOIN_PREFIX}/bin/bitcoin-cli ${BITCOIN_PREFIX}/bin/bitcoind ${BITCOIN_PREFIX}/bin/bitcoin-tx ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.a ${BITCOIN_PREFIX}/lib/libbitcoinconsensus.so.0.0.0 \
&& rm -rf "/tmp/build" "${BERKELEYDB_PREFIX}/docs" \ && rm -rf /tmp/build ${BERKELEYDB_PREFIX}/docs \
&& apk --no-cache --purge del build-dependendencies \ && apk --no-cache --purge del build-dependendencies \
&& apk --no-cache add boost \ && apk --no-cache add boost \
boost-program_options \ boost-program_options \

View File

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2015 Seegno Copyright (c) 2015-2016 Seegno
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal

View File

@ -43,20 +43,7 @@ $ docker run -v ${PWD}/data:/home/bitcoin/.bitcoin -it --rm seegno/bitcoind \
-regtest=1 -regtest=1
``` ```
You can optionally create a `Dockerfile` in the root of your application directory: You can optionally create a service using `docker-compose`:
```Dockerfile
FROM seegno/bitcoind
```
Then simply run:
```sh
$ docker build -t my/bitcoind
$ docker run --rm -it my/bitcoind
```
Or with `docker-compose`:
```yml ```yml
bitcoind: bitcoind:
@ -87,7 +74,7 @@ This image is officially supported on Docker version 1.10, with support for olde
[License information](https://github.com/seegno/docker-bitcoind/blob/master/LICENSE) for the [seegno/docker-bitcoind](https://hub.docker.com/r/seegno/bitcoind) docker project. [License information](https://github.com/seegno/docker-bitcoind/blob/master/LICENSE) for the [seegno/docker-bitcoind](https://hub.docker.com/r/seegno/bitcoind) docker project.
[docker-hub-url]: https://hub.docker.com/r/seegno/bitcoind [docker-hub-url]: https://hub.docker.com/r/seegno/bitcoind
[docker-layers-image]: https://img.shields.io/imagelayers/layers/seegno/bitcoind/latest.svg [docker-layers-image]: https://img.shields.io/imagelayers/layers/seegno/bitcoind/latest.svg?style=flat-square
[docker-pulls-image]: https://img.shields.io/docker/pulls/seegno/bitcoind.svg [docker-pulls-image]: https://img.shields.io/docker/pulls/seegno/bitcoind.svg?style=flat-square
[docker-size-image]: https://img.shields.io/imagelayers/image-size/seegno/bitcoind/latest.svg [docker-size-image]: https://img.shields.io/imagelayers/image-size/seegno/bitcoind/latest.svg?style=flat-square
[docker-stars-image]: https://img.shields.io/docker/stars/seegno/bitcoind.svg [docker-stars-image]: https://img.shields.io/docker/stars/seegno/bitcoind.svg?style=flat-square