From 435051f204bb61c737fc6c9105985c6e64a32565 Mon Sep 17 00:00:00 2001 From: devhyper <57877914+devhyper@users.noreply.github.com> Date: Sat, 19 Mar 2022 11:04:23 -0700 Subject: [PATCH] Fix pricenode/docker --- pricenode/README.md | 8 +- pricenode/docker/Dockerfile | 43 ++++++---- pricenode/docker/README.md | 27 ++---- pricenode/docker/cloudconfig.yml | 103 ----------------------- pricenode/docker/docker-compose.yml | 13 +-- pricenode/docker/installDockerCompose.sh | 4 - pricenode/docker/loop.sh | 8 -- pricenode/docker/rebuildAndRestart.sh | 4 - pricenode/docker/start_node.sh | 1 - pricenode/docker/start_tor.sh | 4 - pricenode/docker/torrc | 6 +- 11 files changed, 39 insertions(+), 182 deletions(-) delete mode 100644 pricenode/docker/cloudconfig.yml delete mode 100644 pricenode/docker/installDockerCompose.sh delete mode 100644 pricenode/docker/loop.sh delete mode 100755 pricenode/docker/rebuildAndRestart.sh delete mode 100644 pricenode/docker/start_node.sh delete mode 100644 pricenode/docker/start_tor.sh diff --git a/pricenode/README.md b/pricenode/README.md index def400788a..8b366432dd 100644 --- a/pricenode/README.md +++ b/pricenode/README.md @@ -41,10 +41,10 @@ This will install the pricenode under the user `pricenode`. At the end of the in To manually test endpoints, run each of the following: ``` bash -curl http://localhost:8080/getAllMarketPrices -curl http://localhost:8080/getFees -curl http://localhost:8080/getParams -curl http://localhost:8080/info +curl http://localhost:8078/getAllMarketPrices +curl http://localhost:8078/getFees +curl http://localhost:8078/getParams +curl http://localhost:8078/info ``` ### Monitoring diff --git a/pricenode/docker/Dockerfile b/pricenode/docker/Dockerfile index cc195cd63b..75401beeb9 100644 --- a/pricenode/docker/Dockerfile +++ b/pricenode/docker/Dockerfile @@ -1,26 +1,33 @@ ### -# The directory of the Dockerfile should contain your 'hostname' and 'private_key' files. -# In the docker-compose.yml file you can pass the ONION_ADDRESS referenced below. +# Haveno pricenode dockerfile ### # pull base image -FROM openjdk:8-jdk +FROM openjdk:11-jdk +# install tor RUN apt-get update && apt-get install -y --no-install-recommends \ - vim \ - tor \ - fakeroot \ - sudo \ - openjfx && rm -rf /var/lib/apt/lists/* + tor && rm -rf /var/lib/apt/lists/* -RUN git clone https://github.com/bisq-network/pricenode.git -WORKDIR /pricenode/ -RUN ./gradlew assemble - -COPY loop.sh start_node.sh start_tor.sh ./ -COPY hostname private_key /var/lib/tor/ +# copy tor configuration file COPY torrc /etc/tor/ -RUN chmod +x *.sh && chown debian-tor:debian-tor /etc/tor/torrc /var/lib/tor/hostname /var/lib/tor/private_key - -CMD ./start_tor.sh && ./start_node.sh -#CMD tail -f /dev/null +# give proper permissions for tor configuration file +RUN chown debian-tor:debian-tor /etc/tor/torrc +# add haveno user +RUN useradd -d /haveno -G debian-tor haveno +# make haveno directory +RUN mkdir -p /haveno +# give haveno user proper permissions +RUN chown haveno:haveno /haveno +# clone haveno repository +RUN git clone https://github.com/haveno-dex/haveno.git /haveno/haveno +# build pricenode +WORKDIR /haveno/haveno +RUN ./gradlew :pricenode:installDist -x test +# set proper java options +ENV JAVA_OPTS="" +# expose ports +EXPOSE 80 +EXPOSE 8078 +# set launch command (tor and pricenode) +CMD tor && /haveno/haveno/haveno-pricenode 2 diff --git a/pricenode/docker/README.md b/pricenode/docker/README.md index 5f7a4e6d11..34fdafd3ff 100644 --- a/pricenode/docker/README.md +++ b/pricenode/docker/README.md @@ -1,17 +1,3 @@ -Needed information to start a pricenode -== - -Copy to this directory: --- - -* a tor `hostname` file, containing your onion address -* a tor `private_key` file, containing the private key for your tor hidden service - -Edit docker-compose.yml: --- - -* fill in your public and private api keys (needs a btcaverage developer subscription) - Needed software to start a pricenode == @@ -21,7 +7,7 @@ Needed software to start a pricenode How to start == -`docker-compose up -d` +`docker compose up -d` How to monitor @@ -31,13 +17,10 @@ See if it's running: `docker ps` Check the logs: `docker-compose logs` +Check the tor hostname: `docker exec docker_pricenode_1 cat /var/lib/tor/pricenode/hostname` -Notes when using CoreOs + +How to test == -Using CoreOs as host OS is entirely optional! - -* the cloudconfig.yml file is a configuration file for starting a coreos machine -from scratch. -* when installing a Coreos server, docker-compose needs to be additionally installed next to the -already provided docker installation +Refer to the main pricenode [README](../README.md). \ No newline at end of file diff --git a/pricenode/docker/cloudconfig.yml b/pricenode/docker/cloudconfig.yml deleted file mode 100644 index d6450b70f7..0000000000 --- a/pricenode/docker/cloudconfig.yml +++ /dev/null @@ -1,103 +0,0 @@ -#cloud-config - -coreos: - update: - reboot-strategy: off - units: - - name: iptables-restore.service - enable: true - command: start - - name: create-swap.service - command: start - runtime: true - content: | - [Unit] - Description=Create swap file - Before=swap.service - - [Service] - Type=oneshot - Environment="SWAPFILE=/2GiB.swap" - ExecStart=/usr/bin/touch ${SWAPFILE} - ExecStart=/usr/bin/chattr +C ${SWAPFILE} - ExecStart=/usr/bin/fallocate -l 2048m ${SWAPFILE} - ExecStart=/usr/bin/chmod 600 ${SWAPFILE} - ExecStart=/usr/sbin/mkswap ${SWAPFILE} - - [Install] - WantedBy=multi-user.target - - name: swap.service - command: start - content: | - [Unit] - Description=Turn on swap - - [Service] - Type=oneshot - Environment="SWAPFILE=/2GiB.swap" - RemainAfterExit=true - ExecStartPre=/usr/sbin/losetup -f ${SWAPFILE} - ExecStart=/usr/bin/sh -c "/sbin/swapon $(/usr/sbin/losetup -j ${SWAPFILE} | /usr/bin/cut -d : -f 1)" - ExecStop=/usr/bin/sh -c "/sbin/swapoff $(/usr/sbin/losetup -j ${SWAPFILE} | /usr/bin/cut -d : -f 1)" - ExecStopPost=/usr/bin/sh -c "/usr/sbin/losetup -d $(/usr/sbin/losetup -j ${SWAPFILE} | /usr/bin/cut -d : -f 1)" - - [Install] - WantedBy=multi-user.target - - name: restart.service - content: | - [Unit] - Description=Restart docker containers - - [Service] - Type=oneshot - ExecStart=/home/core/docker/restartContainers.sh - - name: restart.timer - command: start - content: | - [Unit] - Description=Restarts the app container 2 times a week - - [Timer] - OnCalendar=Mon,Thu *-*-* 6:0:0 - -write_files: - - path: /etc/sysctl.d/swap.conf - permissions: 0644 - owner: root - content: | - vm.swappiness=10 - vm.vfs_cache_pressure=50 - -write_files: - - path: /etc/ssh/sshd_config - permissions: 0600 - owner: root - content: | - # Use most defaults for sshd configuration. - UsePrivilegeSeparation sandbox - Subsystem sftp internal-sftp - UseDNS no - - PermitRootLogin no - AllowUsers core - AuthenticationMethods publickey - -write_files: - - path: /var/lib/iptables/rules-save - permissions: 0644 - owner: 'root:root' - content: | - *filter - :INPUT DROP [0:0] - :FORWARD DROP [0:0] - :OUTPUT ACCEPT [0:0] - -A INPUT -i lo -j ACCEPT - -A INPUT -i eth1 -j ACCEPT - -A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT - -A INPUT -p tcp -m tcp --dport 22 -j ACCEPT - -A INPUT -p tcp -m tcp --dport 80 -j ACCEPT - -A INPUT -p icmp -m icmp --icmp-type 0 -j ACCEPT - -A INPUT -p icmp -m icmp --icmp-type 3 -j ACCEPT - -A INPUT -p icmp -m icmp --icmp-type 11 -j ACCEPT - COMMIT - # the last line of the file needs to be a blank line or a comment diff --git a/pricenode/docker/docker-compose.yml b/pricenode/docker/docker-compose.yml index 9ecdb84688..65815f6c60 100644 --- a/pricenode/docker/docker-compose.yml +++ b/pricenode/docker/docker-compose.yml @@ -1,21 +1,10 @@ version: '3' -# Fill in your own BTCAVERAGE public and private keys - services: pricenode: restart: unless-stopped build: context: . - image: bisq:pricenode ports: - 80:80 - - 8080:8080 - environment: - - BTCAVERAGE_PRIVKEY=!!!!!!!!!!!!!!!!!!!!!!!!! YOUR PRIVATE KEY !!!!!!!!!!!!!!!!!!!!!!!!!!! - - BTCAVERAGE_PUBKEY=!!!!!!!!!!!!!!!!!!!!!!!!!! YOUR PUBKEY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - entropy: - restart: always - image: harbur/haveged:1.7c-1 - container_name: haveged-entropy - privileged: true + - 8078:8078 diff --git a/pricenode/docker/installDockerCompose.sh b/pricenode/docker/installDockerCompose.sh deleted file mode 100644 index f41ef50307..0000000000 --- a/pricenode/docker/installDockerCompose.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -mkdir -p /opt/bin -curl -L `curl -s https://api.github.com/repos/docker/compose/releases/latest | jq -r '.assets[].browser_download_url | select(contains("Linux") and contains("x86_64"))'` > /opt/bin/docker-compose -chmod +x /opt/bin/docker-compose diff --git a/pricenode/docker/loop.sh b/pricenode/docker/loop.sh deleted file mode 100644 index 1382fbb13c..0000000000 --- a/pricenode/docker/loop.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -while true -do -echo `date` "(Re)-starting node" -java -jar ./build/libs/bisq-pricenode.jar 2 2 -echo `date` "node terminated unexpectedly!!" -sleep 3 -done diff --git a/pricenode/docker/rebuildAndRestart.sh b/pricenode/docker/rebuildAndRestart.sh deleted file mode 100755 index a30d2b21db..0000000000 --- a/pricenode/docker/rebuildAndRestart.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -docker-compose build --no-cache && docker-compose up -d -docker image prune -f -docker-compose logs -f diff --git a/pricenode/docker/start_node.sh b/pricenode/docker/start_node.sh deleted file mode 100644 index 225994130a..0000000000 --- a/pricenode/docker/start_node.sh +++ /dev/null @@ -1 +0,0 @@ -nohup sh loop.sh diff --git a/pricenode/docker/start_tor.sh b/pricenode/docker/start_tor.sh deleted file mode 100644 index 40fa1e9e0c..0000000000 --- a/pricenode/docker/start_tor.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# sudo -u debian-tor -nohup sudo -u debian-tor tor > /dev/null 2>errors_tor.log & diff --git a/pricenode/docker/torrc b/pricenode/docker/torrc index 9de1a9166e..4c39cdb6e6 100644 --- a/pricenode/docker/torrc +++ b/pricenode/docker/torrc @@ -1,2 +1,4 @@ -HiddenServiceDir /var/lib/tor/ -HiddenServicePort 80 127.0.0.1:8080 +HiddenServiceDir /var/lib/tor/pricenode/ +HiddenServicePort 80 127.0.0.1:8078 +HiddenServiceVersion 3 +RunAsDaemon 1