From 1bb48e8e952bf16f60360b4412123cc6ccedfda9 Mon Sep 17 00:00:00 2001 From: bensig Date: Wed, 3 Aug 2022 03:19:05 +0000 Subject: [PATCH 1/2] working --- .gitignore | 1 + Dockerfile-minimal-api | 0 Dockerfile-minimal-p2p | 0 Dockerfile-minimal-sampler | 0 README.md | 0 configs/docker/default.env | 0 configs/docker/nginx.yaml | 13 ++- configs/docker/nodeos-minimal-api.yaml | 0 configs/docker/nodeos-minimal-base.yaml | 0 configs/docker/nodeos-minimal-p2p.yaml | 0 configs/docker/nodeos-minimal-sampler.yaml | 0 configs/nginx/nginx.conf | 0 configs/nodeos/example-minimal-api.config.ini | 4 +- configs/nodeos/example-minimal-p2p.config.ini | 0 docker-compose.override.yaml | 0 docker-compose.yaml | 11 ++- init-letsencrypt.sh | 80 +++++++++++++++++++ peers.ini | 9 +++ scripts/entrypoint-minimal-api.sh | 7 +- scripts/entrypoint-minimal-p2p.sh | 26 ------ scripts/entrypoint-minimal-sampler.sh | 38 --------- shared/nginx/.gitkeep | 0 shared/nodeos/.gitkeep | 0 23 files changed, 117 insertions(+), 72 deletions(-) mode change 100644 => 100755 Dockerfile-minimal-api mode change 100644 => 100755 Dockerfile-minimal-p2p mode change 100644 => 100755 Dockerfile-minimal-sampler mode change 100644 => 100755 README.md mode change 100644 => 100755 configs/docker/default.env mode change 100644 => 100755 configs/docker/nginx.yaml mode change 100644 => 100755 configs/docker/nodeos-minimal-api.yaml mode change 100644 => 100755 configs/docker/nodeos-minimal-base.yaml mode change 100644 => 100755 configs/docker/nodeos-minimal-p2p.yaml mode change 100644 => 100755 configs/docker/nodeos-minimal-sampler.yaml mode change 100644 => 100755 configs/nginx/nginx.conf mode change 100644 => 100755 configs/nodeos/example-minimal-api.config.ini mode change 100644 => 100755 configs/nodeos/example-minimal-p2p.config.ini mode change 100644 => 100755 docker-compose.override.yaml mode change 100644 => 100755 docker-compose.yaml create mode 100755 init-letsencrypt.sh create mode 100644 peers.ini mode change 100644 => 100755 scripts/entrypoint-minimal-api.sh delete mode 100644 scripts/entrypoint-minimal-p2p.sh delete mode 100644 scripts/entrypoint-minimal-sampler.sh mode change 100644 => 100755 shared/nginx/.gitkeep mode change 100644 => 100755 shared/nodeos/.gitkeep diff --git a/.gitignore b/.gitignore index fdb228b..cdea215 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ configs/nginx.conf downloads shared/nginx/*.conf shared/nodeos/*.sock +certbot/* diff --git a/Dockerfile-minimal-api b/Dockerfile-minimal-api old mode 100644 new mode 100755 diff --git a/Dockerfile-minimal-p2p b/Dockerfile-minimal-p2p old mode 100644 new mode 100755 diff --git a/Dockerfile-minimal-sampler b/Dockerfile-minimal-sampler old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/configs/docker/default.env b/configs/docker/default.env old mode 100644 new mode 100755 diff --git a/configs/docker/nginx.yaml b/configs/docker/nginx.yaml old mode 100644 new mode 100755 index c3096f5..f2a7757 --- a/configs/docker/nginx.yaml +++ b/configs/docker/nginx.yaml @@ -7,6 +7,17 @@ services: ports: - "${NETWORK_PORT_API}:8888" - "${NETWORK_PORT_P2P}:9876" + - 80:80 + - 443:443 + restart: always volumes: - ../nginx.conf:/etc/nginx/nginx.conf:ro - - ../../shared:/eosio/shared \ No newline at end of file + - ../../shared:/eosio/shared + - /opt/eosio/src/docker-nodeos/certbot/www/:/var/www/certbot/:rw + - /opt/eosio/src/docker-nodeos/certbot/conf/:/etc/nginx/ssl/:rw + - /opt/eosio/src/docker-nodeos/certbot/letsencrypt/:/etc/letsencrypt/:rw + logging: + options: + max-size: "10m" + max-file: "3" + diff --git a/configs/docker/nodeos-minimal-api.yaml b/configs/docker/nodeos-minimal-api.yaml old mode 100644 new mode 100755 diff --git a/configs/docker/nodeos-minimal-base.yaml b/configs/docker/nodeos-minimal-base.yaml old mode 100644 new mode 100755 diff --git a/configs/docker/nodeos-minimal-p2p.yaml b/configs/docker/nodeos-minimal-p2p.yaml old mode 100644 new mode 100755 diff --git a/configs/docker/nodeos-minimal-sampler.yaml b/configs/docker/nodeos-minimal-sampler.yaml old mode 100644 new mode 100755 diff --git a/configs/nginx/nginx.conf b/configs/nginx/nginx.conf old mode 100644 new mode 100755 diff --git a/configs/nodeos/example-minimal-api.config.ini b/configs/nodeos/example-minimal-api.config.ini old mode 100644 new mode 100755 index f16caa4..dc14a9a --- a/configs/nodeos/example-minimal-api.config.ini +++ b/configs/nodeos/example-minimal-api.config.ini @@ -17,7 +17,7 @@ http-validate-host = false # state read-mode = head validation-mode = full -chain-state-db-size-mb = 131070 +chain-state-db-size-mb = 16384 reversible-blocks-db-size-mb = 2048 # blocks - Retain 24 hours worth of blocks (2 * 60 * 60 * 24 = 172800) @@ -27,4 +27,4 @@ max-retained-block-files = 1728 # plugins plugin = eosio::chain_plugin eosio::chain_api_plugin -plugin = eosio::http_plugin \ No newline at end of file +plugin = eosio::http_plugin diff --git a/configs/nodeos/example-minimal-p2p.config.ini b/configs/nodeos/example-minimal-p2p.config.ini old mode 100644 new mode 100755 diff --git a/docker-compose.override.yaml b/docker-compose.override.yaml old mode 100644 new mode 100755 diff --git a/docker-compose.yaml b/docker-compose.yaml old mode 100644 new mode 100755 index 66f15c8..e45e62f --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -7,9 +7,16 @@ services: file: ./configs/docker/nodeos-minimal-api.yaml service: nodeos nginx: - depends_on: - - nodeos +# depends_on: +# - nodeos extends: file: ./configs/docker/nginx.yaml service: nginx profiles: ["nginx"] + certbot: + image: certbot/certbot:latest + volumes: + - ./certbot/www/:/var/www/certbot/:rw + - ./certbot/logs:/var/log/letsencrypt/:rw + - ./certbot/letsencrypt/:/etc/letsencrypt/:rw + diff --git a/init-letsencrypt.sh b/init-letsencrypt.sh new file mode 100755 index 0000000..b40bb61 --- /dev/null +++ b/init-letsencrypt.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +if ! [ -x "$(command -v docker-compose)" ]; then + echo 'Error: docker-compose is not installed.' >&2 + exit 1 +fi + +domains=(api.eos.heliosrising.com) +rsa_key_size=4096 +data_path="./certbot" +email="ben@heliosrising.com" # Adding a valid address is strongly recommended +staging=0 # Set to 1 if you're testing your setup to avoid hitting request limits + +if [ -d "$data_path" ]; then + read -p "Existing data found for $domains. Continue and replace existing certificate? (y/N) " decision + if [ "$decision" != "Y" ] && [ "$decision" != "y" ]; then + exit + fi +fi + + +if [ ! -e "$data_path/conf/options-ssl-nginx.conf" ] || [ ! -e "$data_path/conf/ssl-dhparams.pem" ]; then + echo "### Downloading recommended TLS parameters ..." + mkdir -p "$data_path/conf" + curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot-nginx/certbot_nginx/_internal/tls_configs/options-ssl-nginx.conf > "$data_path/conf/options-ssl-nginx.conf" + curl -s https://raw.githubusercontent.com/certbot/certbot/master/certbot/certbot/ssl-dhparams.pem > "$data_path/conf/ssl-dhparams.pem" + echo +fi + +echo "### Creating dummy certificate for $domains ..." +path="/etc/letsencrypt/live/$domains" +mkdir -p "$data_path/conf/live/$domains" +docker-compose run --rm --entrypoint "\ + openssl req -x509 -nodes -newkey rsa:$rsa_key_size -days 1\ + -keyout '$path/privkey.pem' \ + -out '$path/fullchain.pem' \ + -subj '/CN=localhost'" certbot +echo + + +echo "### Starting nginx ..." +docker-compose up --force-recreate -d nginx +echo + +echo "### Deleting dummy certificate for $domains ..." +docker-compose run --rm --entrypoint "\ + rm -Rf /etc/letsencrypt/live/$domains && \ + rm -Rf /etc/letsencrypt/archive/$domains && \ + rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot +echo + + +echo "### Requesting Let's Encrypt certificate for $domains ..." +#Join $domains to -d args +domain_args="" +for domain in "${domains[@]}"; do + domain_args="$domain_args -d $domain" +done + +# Select appropriate email arg +case "$email" in + "") email_arg="--register-unsafely-without-email" ;; + *) email_arg="--email $email" ;; +esac + +# Enable staging mode if needed +if [ $staging != "0" ]; then staging_arg="--staging"; fi + +docker-compose run --rm --entrypoint "\ + certbot certonly --webroot -w /var/www/certbot \ + $staging_arg \ + $email_arg \ + $domain_args \ + --rsa-key-size $rsa_key_size \ + --agree-tos \ + --force-renewal" certbot +echo + +echo "### Reloading nginx ..." +docker-compose exec nginx nginx -s reload diff --git a/peers.ini b/peers.ini new file mode 100644 index 0000000..1d70ba2 --- /dev/null +++ b/peers.ini @@ -0,0 +1,9 @@ +p2p-peer-address = eos.seed.eosnation.io:9876 +p2p-peer-address = seed.greymass.com:9876 +p2p-peer-address = p2p.mainnet.eosrio.io:9876 +p2p-peer-address = p2p.donates2eden.io:9876 +p2p-peer-address = p2p.eoscafeblock.com:9000 +p2p-peer-address = p2p.eosdetroit.io:3018 +p2p-peer-address = peer.main.alohaeos.com:9876 +p2p-peer-address = p2p.eos42.io:9876 +p2p-peer-address = eos.seed.eosnation.io:9876 diff --git a/scripts/entrypoint-minimal-api.sh b/scripts/entrypoint-minimal-api.sh old mode 100644 new mode 100755 index 301f77f..cee12ad --- a/scripts/entrypoint-minimal-api.sh +++ b/scripts/entrypoint-minimal-api.sh @@ -21,7 +21,8 @@ IP=`ifconfig eth0 | grep 'inet ' | awk '{print $2}'` INDEX=`dig -x $IP +short | sed 's/.*_\([0-9]*\)\..*/\1/'` NODEOS_SOCK=/eosio/shared/nodeos/$NETWORK_NAME$INDEX.sock echo "generating unique unix sock file name ($NODEOS_SOCK)" -echo unix-socket-path = $NODEOS_SOCK >> /eosio/sock.ini +rm /eosio/sock.ini +echo unix-socket-path = $NODEOS_SOCK > /eosio/sock.ini touch $NODEOS_SOCK chmod 777 $NODEOS_SOCK @@ -29,10 +30,10 @@ chmod 777 $NODEOS_SOCK echo "server unix:$NODEOS_SOCK fail_timeout=1 max_fails=3 weight=65535;" > /eosio/shared/nginx/$NETWORK_NAME$INDEX.conf # Combine all configs to final version -cat /eosio/peers.ini /eosio/sock.ini /eosio/base.ini >> /eosio/config.ini +cat /eosio/peers.ini /eosio/sock.ini /eosio/base.ini > /eosio/config.ini echo "config.ini generation complete!" # Start based on snapshot echo "starting nodeos..." cd /eosio -/eosio/nodeos --data-dir=/ramdisk --config-dir=. --snapshot=/eosio/downloads/snapshot.bin \ No newline at end of file +/eosio/nodeos --data-dir=/ramdisk --config-dir=. --snapshot=/eosio/downloads/snapshot.bin diff --git a/scripts/entrypoint-minimal-p2p.sh b/scripts/entrypoint-minimal-p2p.sh deleted file mode 100644 index eef7e67..0000000 --- a/scripts/entrypoint-minimal-p2p.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash - -# Grab latest snapshot -echo "downloading snapshot from $NODEOS_SNAPSHOT" -cd /eosio/downloads -curl -s -o /eosio/downloads/snapshot.tar.gz $NODEOS_SNAPSHOT -tar -xvf /eosio/downloads/snapshot.tar.gz -rm /eosio/downloads/snapshot.tar.gz -mv /eosio/downloads/*.bin /eosio/downloads/snapshot.bin -echo "snapshot downloaded and extracted!" - -# Creating p2p portion of the config -echo "generating p2p information for config..." -for peer in $NODEOS_PEERS -do - echo p2p-peer-address = $peer >> /eosio/peers.ini -done - -# Combine all configs to final version -cat /eosio/peers.ini /eosio/base.ini >> /eosio/config.ini -echo "config.ini generation complete!" - -# Start based on snapshot -echo "starting nodeos..." -cd /eosio -/eosio/nodeos --data-dir=/ramdisk --config-dir=. --snapshot=/eosio/downloads/snapshot.bin \ No newline at end of file diff --git a/scripts/entrypoint-minimal-sampler.sh b/scripts/entrypoint-minimal-sampler.sh deleted file mode 100644 index 8e5a292..0000000 --- a/scripts/entrypoint-minimal-sampler.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -# Grab latest snapshot -echo "downloading snapshot from $NODEOS_SNAPSHOT" -cd /eosio/downloads -curl -s -o /eosio/downloads/snapshot.tar.gz $NODEOS_SNAPSHOT -tar -xvf /eosio/downloads/snapshot.tar.gz -rm /eosio/downloads/snapshot.tar.gz -mv /eosio/downloads/*.bin /eosio/downloads/snapshot.bin -echo "snapshot downloaded and extracted!" - -# Creating p2p portion of the config -echo "generating p2p information for config..." -for peer in $NODEOS_PEERS -do - echo p2p-peer-address = $peer >> /eosio/peers.ini -done - -# Creating unix sock name based on container scaling index -IP=`ifconfig eth0 | grep 'inet ' | awk '{print $2}'` -INDEX=`dig -x $IP +short | sed 's/.*_\([0-9]*\)\..*/\1/'` -NODEOS_SOCK=/eosio/shared/nodeos/$NETWORK_NAME$INDEX.sock -echo "generating unique unix sock file name ($NODEOS_SOCK)" -echo unix-socket-path = $NODEOS_SOCK >> /eosio/sock.ini -touch $NODEOS_SOCK -chmod 777 $NODEOS_SOCK - -# Create nginx upstream entry for this server -echo "server unix:$NODEOS_SOCK fail_timeout=1 max_fails=3 weight=65535;" > /eosio/shared/nginx/$NETWORK_NAME$INDEX.conf - -# Combine all configs to final version -cat /eosio/peers.ini /eosio/sock.ini /eosio/base.ini >> /eosio/config.ini -echo "config.ini generation complete!" - -# Start based on snapshot -echo "starting nodeos..." -cd /eosio -/eosio/nodeos --data-dir=/ramdisk --skip-all-checks --config-dir=. --snapshot=/eosio/downloads/snapshot.bin \ No newline at end of file diff --git a/shared/nginx/.gitkeep b/shared/nginx/.gitkeep old mode 100644 new mode 100755 diff --git a/shared/nodeos/.gitkeep b/shared/nodeos/.gitkeep old mode 100644 new mode 100755 From f9ea554b8bcccdb087ff243a86b33fdd90948df0 Mon Sep 17 00:00:00 2001 From: bensig Date: Fri, 23 Sep 2022 18:24:24 +0000 Subject: [PATCH 2/2] update for leap 3.1 --- Dockerfile-minimal-api | 9 +++++---- README.md | 19 +++++++++++++++---- configs/nginx/nginx.conf | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Dockerfile-minimal-api b/Dockerfile-minimal-api index 3ccfd59..7e51659 100755 --- a/Dockerfile-minimal-api +++ b/Dockerfile-minimal-api @@ -1,7 +1,7 @@ FROM ubuntu:18.04 # install required software -RUN apt-get update --fix-missing && apt-get install -y curl git dnsutils net-tools +RUN apt-get update --fix-missing && apt-get install -y curl git dnsutils net-tools wget # setup folder structure RUN mkdir /eosio @@ -15,12 +15,13 @@ ARG NODEOS_VERSION ENV NODEOS_VERSION $NODEOS_VERSION # build nodeos -RUN git clone $NODEOS_REPOSITORY /eosio/build WORKDIR /eosio/build -RUN git checkout $NODEOS_VERSION +RUN git clone -b $NODEOS_VERSION $NODEOS_REPOSITORY /eosio/build RUN git submodule update --init --recursive -RUN apt-get update --fix-missing && ./scripts/eosio_build.sh -y +RUN apt-get update --fix-missing +RUN ./scripts/install_deps.sh && ./scripts/pinned_build.sh /eosio/deps /eosio/build/build $(nproc) RUN cp /eosio/build/build/programs/nodeos/nodeos /eosio/nodeos +RUN rm -rf /eosio/build/build /eosio/build/deps # configure nodeos COPY configs/config.ini /eosio/base.ini diff --git a/README.md b/README.md index 8460fb2..fee2d4b 100755 --- a/README.md +++ b/README.md @@ -24,17 +24,28 @@ cp configs/docker/default.env .env This file contains the following parameters: ``` +# The name of the network this environment is for (must be unique on the host machine) +NETWORK_NAME=EOS + +# The port to expose the nodeos api(s) on the host machine +NETWORK_PORT_API=8888 + +# The port to expose the nodeos p2p procotol on the host machine +NETWORK_PORT_P2P=9876 + # The git repository of the nodeos (EOSIO) repository to use -NODEOS_REPOSITORY=https://github.com/EOSIO/eos.git +NODEOS_REPOSITORY=https://github.com/AntelopeIO/leap.git # The branch/tag of nodeos to checkout during the build process -NODEOS_VERSION=v2.1.0 +NODEOS_VERSION=v3.1.0 # A snapshot (compressed as tar.gz) to use during the startup of this node -NODEOS_SNAPSHOT=https://snapshots.greymass.network/jungle/latest.tar.gz +#NODEOS_SNAPSHOT=https://snapshots.greymass.network/jungle/latest.tar.gz +NODEOS_SNAPSHOT=https://snapshots.greymass.network/eos/latest.tar.gz # Peers to inject into the nodeos configuration -NODEOS_PEERS=peer.jungle3.alohaeos.com:9876 jungle.eosn.io:9876 jungle3.eosrio.io:58012 +#NODEOS_PEERS=peer.jungle3.alohaeos.com:9876 jungle.eosn.io:9876 jungle3.eosrio.io:58012 +NODEOS_PEERS=seed.greymass.com:9876 p2p.mainnet.eosrio.io:9876 p2p.donates2eden.io:9876 p2p.eoscafeblock.com:9000 p2p.eosdetroit.io:3018 peer.main.alohaeos.com:9876 p2p.eos42.io:9876 eos.seed.eosnation.io:9876 ``` The second thing you'll need to configure is the nodeos configuration file itself. Create a copy of this configuration file as outlined below, and it'll be passed to the container for use. diff --git a/configs/nginx/nginx.conf b/configs/nginx/nginx.conf index 76d33eb..7c9bfac 100755 --- a/configs/nginx/nginx.conf +++ b/configs/nginx/nginx.conf @@ -31,7 +31,7 @@ http { upstream nodes { include /eosio/shared/nginx/*.conf; - server nodeos:8888 weight=1; + server nodeos:8881 weight=1; } server {