Skip to content

Commit

Permalink
Merge pull request spesmilo#3 from BTCPrivate/master
Browse files Browse the repository at this point in the history
More minor changes removing ZCL
  • Loading branch information
pjain committed Mar 5, 2018
2 parents dfdb741 + 1fa14c6 commit 38e48cd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
FROM ubuntu:18.04

ENV VERSION 1.0.2
ENV VERSION 1.0.0

RUN set -x \
&& apt-get update \
&& apt-get install -y curl \
&& curl -sL https://github.com/BTCP-community/electrum-zcl/archive/Z!${VERSION}.tar.gz |tar xzv \
&& mv electrum-zcl-Z-${VERSION} electrum-zcl \
&& cd electrum-zcl \
&& curl -sL https://github.com/BTCPrivate/electrum-btcp/archive/P!${VERSION}.tar.gz |tar xvz \
&& mv electrum-btcp-P-${VERSION} electrum-btcp \
&& cd electrum-btcp \
&& apt-get install -y $(grep -vE "^\s*#" packages.txt | tr "\n" " ") \
&& pip3 install -r requirements.txt \
&& pip3 install pyblake2 \
&& protoc --proto_path=lib/ --python_out=lib/ lib/paymentrequest.proto \
&& pyrcc5 icons.qrc -o gui/qt/icons_rc.py \
&& ./contrib/make_locale

WORKDIR /electrum-zcl
WORKDIR /electrum-btcp

ENV DISPLAY :0

Expand Down
2 changes: 1 addition & 1 deletion build-docker.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

docker build -t electrum-zcl:latest .
docker build -t electrum-btcp:latest .
4 changes: 2 additions & 2 deletions run-docker.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
XSOCK=/tmp/.X11-unix
XAUTH=/tmp/.docker.xauth
DATADIR=.electrum-zcl
DATADIR=.electrum-btcp
xauth nlist :0 | sed -e 's/^..../ffff/' | xauth -f $XAUTH nmerge -
docker run -ti -v $HOME/$DATADIR:/root/$DATADIR -v $XSOCK:$XSOCK -v $XAUTH:$XAUTH -e XAUTHORITY=$XAUTH electrum-zcl:latest
docker run -ti -v $HOME/$DATADIR:/root/$DATADIR -v $XSOCK:$XSOCK -v $XAUTH:$XAUTH -e XAUTHORITY=$XAUTH electrum-btcp:latest

0 comments on commit 38e48cd

Please sign in to comment.