From 567f6fd077a6b1902d9683a9435ebf11edddcd79 Mon Sep 17 00:00:00 2001 From: Yancy Ribbens Date: Fri, 11 Oct 2019 14:02:29 -0500 Subject: [PATCH 1/2] add a release arg to set which release is built --- Dockerfile | 12 ++++++++++++ docker-compose.yml | 5 +++-- elements.0.17.0/Dockerfile | 12 ------------ elements.0.18.1/Dockerfile | 12 ------------ 4 files changed, 15 insertions(+), 26 deletions(-) create mode 100644 Dockerfile delete mode 100644 elements.0.17.0/Dockerfile delete mode 100644 elements.0.18.1/Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..06efaf4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:18.04 +ARG release=elements-0.18.1.1 + +RUN apt-get update && apt-get install -y \ + wget && \ + cd /opt && \ + wget https://github.com/ElementsProject/elements/releases/download/$release/$release-x86_64-linux-gnu.tar.gz && \ + tar zxvf $release-x86_64-linux-gnu.tar.gz && \ + cd $release && \ + ln -s /opt/$release/bin/elementsd /usr/bin/elementsd && \ + ln -s /opt/$release/bin/elements-cli /usr/bin/elements-cli && \ + sed -i -e '$a alias ecli="elements-cli -chain=liquidregtest -rpcuser=elements -rpcpassword=elements"' /root/.bashrc diff --git a/docker-compose.yml b/docker-compose.yml index fec8923..a646b7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,9 @@ services: elementsd: container_name: 'elements' build: - context: ./elements.0.17.0 - dockerfile: Dockerfile + context: . + args: + release: elements-0.18.1.1 networks: app_net: ipv4_address: 172.32.0.2 diff --git a/elements.0.17.0/Dockerfile b/elements.0.17.0/Dockerfile deleted file mode 100644 index 3c82faa..0000000 --- a/elements.0.17.0/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:18.04 - -RUN apt-get update && apt-get install -y \ - wget && \ - cd /opt && \ - wget https://github.com/ElementsProject/elements/releases/download/elements-0.17.0.2/elements-0.17.0.2-x86_64-linux-gnu.tar.gz && \ - tar zxvf elements-0.17.0.2-x86_64-linux-gnu.tar.gz && \ - cd elements-0.17.0 && \ - ln -s /opt/elements-0.17.0/bin/elementsd /usr/bin/elementsd && \ - ln -s /opt/elements-0.17.0/bin/elements-cli /usr/bin/elements-cli && \ - sed -i -e '$a alias ecli="elements-cli -chain=liquidregtest -rpcuser=elements -rpcpassword=elements"' /root/.bashrc - diff --git a/elements.0.18.1/Dockerfile b/elements.0.18.1/Dockerfile deleted file mode 100644 index 57be310..0000000 --- a/elements.0.18.1/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM ubuntu:18.04 - -RUN apt-get update && apt-get install -y \ - wget && \ - cd /opt && \ - wget https://github.com/ElementsProject/elements/releases/download/elements-0.18.1/elements-0.18.1-x86_64-linux-gnu.tar.gz && \ - tar zxvf elements-0.18.1-x86_64-linux-gnu.tar.gz && \ - cd elements-0.18.1 && \ - ln -s /opt/elements-0.18.1/bin/elementsd /usr/bin/elementsd && \ - ln -s /opt/elements-0.18.1/bin/elements-cli /usr/bin/elements-cli && \ - sed -i -e '$a alias ecli="elements-cli -chain=liquidregtest -rpcuser=elements -rpcpassword=elements"' /root/.bashrc - From 78b4d643668d92327ecf4a6a94b4be52a309f548 Mon Sep 17 00:00:00 2001 From: Yancy Ribbens Date: Sun, 13 Oct 2019 10:53:00 -0500 Subject: [PATCH 2/2] add env and build args for switching to a different blockchain such as regtest --- .env | 3 +++ Dockerfile | 3 ++- docker-compose.yml | 10 ++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..e1207e2 --- /dev/null +++ b/.env @@ -0,0 +1,3 @@ +RELEASE=elements-0.18.1.1 +CHAIN=regtest +DAEMON_RPC=18443 diff --git a/Dockerfile b/Dockerfile index 06efaf4..2a59c21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:18.04 ARG release=elements-0.18.1.1 +ARG chain=liquidregtest RUN apt-get update && apt-get install -y \ wget && \ @@ -9,4 +10,4 @@ RUN apt-get update && apt-get install -y \ cd $release && \ ln -s /opt/$release/bin/elementsd /usr/bin/elementsd && \ ln -s /opt/$release/bin/elements-cli /usr/bin/elements-cli && \ - sed -i -e '$a alias ecli="elements-cli -chain=liquidregtest -rpcuser=elements -rpcpassword=elements"' /root/.bashrc + echo "alias ecli=\"elements-cli -chain=$chain -rpcuser=elements -rpcpassword=elements\"" >> /root/.bashrc diff --git a/docker-compose.yml b/docker-compose.yml index a646b7d..3fbb404 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,16 +13,18 @@ services: build: context: . args: - release: elements-0.18.1.1 + release: ${RELEASE} + chain: ${CHAIN} networks: app_net: ipv4_address: 172.32.0.2 ports: - "127.0.0.1:18444:18444" - "127.0.0.1:7040:7040" + - "127.0.0.1:18443:18443" command: > elementsd - -chain=liquidregtest + -chain=${CHAIN} -debug -listenonion=0 -server=1 @@ -50,7 +52,7 @@ services: -vvvv --timestamp --jsonrpc-import - --network liquidregtest + --network ${CHAIN} --cookie elements:elements - --daemon-rpc-addr 172.32.0.2:7040 + --daemon-rpc-addr 172.32.0.2:${DAEMON_RPC} --http-addr 0.0.0.0:3002