Skip to content

Commit

Permalink
Merge pull request #262 from dlt-green/release/v.1.4.6
Browse files Browse the repository at this point in the history 
Release v.1.4.6
  • Loading branch information
@dlt-green
dlt-green authored Dec 21, 2022
2 parents 12de4a1 + a544db3 commit 207e496
Show file tree
Hide file tree
Showing 8 changed files with 203 additions and 308 deletions.
142 changes: 9 additions & 133 deletions build.sh
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,10 @@
#!/bin/bash
set -e
source ./common/scripts/prepare_docker_functions.sh

BUILD_DIR=./build
EXCLUSIONS="assets/traefik, build, data, .env, build.sh, .gitignore"

NODES="iota-hornet iota-bee iota-goshimmer wasp shimmer-hornet"
HORNET_VERSION=1.2.1
WASP_VERSION=0.3.8
WASP_DEV_BRANCH="develop"

prepare_dockerx_builder () {
shutdown_dockerx_builder
sudo apt-get install -y qemu qemu-user-static
docker buildx create --name iota-builder
docker buildx use iota-builder
docker buildx inspect --bootstrap
}

shutdown_dockerx_builder () {
if [ "$(docker buildx ls | grep iota-builder)" != "" ]; then
docker buildx rm iota-builder
fi
}

build_node () {
node=$1
Expand Down Expand Up @@ -54,83 +36,6 @@ build_node () {
echo "$node.tar.gz built successfully"
}

build_hornet_image () {
imageName=dltgreen/iota-hornet:$HORNET_VERSION
buildDirHornet=$BUILD_DIR/tmp_hornet

mkdir -p $buildDirHornet
#(cd $buildDirHornet; curl -L -o hornet.tar.gz https://github.com/iotaledger/hornet/archive/refs/tags/v${HORNET_VERSION}.tar.gz; tar -xvf hornet.tar.gz --strip 1)
(cd $BUILD_DIR; git clone https://github.com/iotaledger/hornet.git tmp_hornet; cd tmp_hornet; git checkout v${HORNET_VERSION})

if [ -f $buildDirHornet/docker/Dockerfile ]; then
(cd $buildDirHornet; docker build --no-cache -f docker/Dockerfile -t $imageName .)
fi

docker save $imageName > $BUILD_DIR/iota-hornet-$HORNET_VERSION.tar
rm -Rf $buildDirHornet

push_docker_image $imageName
}

build_wasp_image () {
local repoTag=$1
local name=$2
local imageTag=$3

local imageName=dltgreen/$name:$imageTag
local buildDirWasp=$BUILD_DIR/tmp_wasp

rm -Rf $buildDirWasp && mkdir -p $buildDirWasp
(cd $BUILD_DIR; git clone https://github.com/iotaledger/wasp.git tmp_wasp; cd tmp_wasp; git checkout $repoTag)

if [ -f $buildDirWasp/Dockerfile ]; then
prepare_dockerx_builder
(cd $buildDirWasp; docker buildx build --platform linux/amd64,linux/arm64 -t $imageName --push .)
shutdown_dockerx_builder
fi

rm -Rf $buildDirWasp
}

build_wasp-cli_image () {
local repoTag=$1
local name=$2
local imageTag=$3

local imageName=dltgreen/$name:$imageTag
local buildDirWaspCli=$BUILD_DIR/tmp_wasp

rm -Rf $buildDirWaspCli && mkdir -p $buildDirWaspCli
(cd $BUILD_DIR; git clone https://github.com/iotaledger/wasp.git tmp_wasp; cd tmp_wasp; git checkout $repoTag)

#patch "$buildDirWaspCli/Dockerfile" < ./wasp-cli/Dockerfile_wasp-cli.diff
cp -f "$buildDirWaspCli/Dockerfile" "$buildDirWaspCli/Dockerfile.orig"
cp -f ./wasp-cli/Dockerfile "$buildDirWaspCli/Dockerfile"
rm -f $buildDirWaspCli/.dockerignore
echo .git > $buildDirWaspCli/.dockerignore
echo .github >> $buildDirWaspCli/.dockerignore

prepare_dockerx_builder
(cd $buildDirWaspCli; docker buildx build --platform linux/amd64,linux/arm64 -t $imageName --push .)
shutdown_dockerx_builder

rm -Rf $buildDirWaspCli
}

push_docker_image () {
local imageName=$1

print_line
read -p "Push docker image to dockerhub? (y/n) " yn
echo ""
case $yn in
y) docker push $imageName
;;
*) echo "Image has not been pushed"
;;
esac
}

upload_build_artefacts () {
envFile=$(dirname "$0")/.env
if [ ! -e "$envFile" ]; then
Expand Down Expand Up @@ -161,6 +66,11 @@ enter_to_continue () {
echo $fl; read -p 'Press [Enter] key to continue... Press [STRG+C] to cancel...' W; echo $xx
}

print_line () {
local columns="$1"
printf '%*s\n' "${columns:-$(tput cols)}" '' | tr ' ' -
}

print_menu () {
local longestArgumentLength=0
for item in "$@"; do
Expand Down Expand Up @@ -204,44 +114,15 @@ print_menu () {
}

MainMenu() {
print_menu "Docker images" "Node packages" "Build management" "Exit"
print_menu "Node packages" "Build management" "Exit"
read -p '> ' n
case $n in
1) DockerImagesMenu ;;
2) NodePackagesMenu ;;
3) BuildManagementMenu ;;
1) NodePackagesMenu ;;
2) BuildManagementMenu ;;
*) clear; exit ;;
esac
}

DockerImagesMenu() {
print_menu "iota-hornet ($HORNET_VERSION)" "wasp ($WASP_VERSION)" "wasp-cli ($WASP_VERSION)" "wasp (dev)" "Back"
read -p '> ' n
case $n in
1) print_line
build_hornet_image
enter_to_continue
DockerImagesMenu
;;
2) print_line
build_wasp_image "v$WASP_VERSION" "wasp" "$WASP_VERSION"
enter_to_continue
DockerImagesMenu
;;
3) print_line
build_wasp-cli_image "v$WASP_VERSION" "wasp-cli" "$WASP_VERSION"
enter_to_continue
DockerImagesMenu
;;
4) print_line
build_wasp_image "$WASP_DEV_BRANCH" "wasp" "dev"
enter_to_continue
DockerImagesMenu
;;
*) MainMenu ;;
esac
}

NodePackagesMenu() {
print_menu "all" "iota-hornet" "iota-bee" "iota-goshimmer" "shimmer-hornet" "wasp" "Back"
read -p '> ' n
Expand Down Expand Up @@ -281,7 +162,7 @@ NodePackagesMenu() {
}

BuildManagementMenu() {
print_menu "Clean build dir" "Upload build artefacts" "Prepare dockerx builder" "Back"
print_menu "Clean build dir" "Upload build artefacts" "Back"
read -p '> ' n
case $n in
1) print_line
Expand All @@ -293,11 +174,6 @@ BuildManagementMenu() {
upload_build_artefacts
enter_to_continue
BuildManagementMenu
;;
3) print_line
prepare_dockerx_builder
enter_to_continue
DockerImagesMenu
;;
*) MainMenu ;;
esac
Expand Down
55 changes: 43 additions & 12 deletions node-installer.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

VRSN="v.1.4.5"
BUILD="20221203_145700"
VRSN="v.1.4.6"
BUILD="20221221_211601"

VAR_DOMAIN=''
VAR_HOST=''
Expand All @@ -15,8 +15,8 @@ VAR_IOTA_HORNET_VERSION='1.2.1'
VAR_IOTA_BEE_VERSION='0.3.1'
VAR_IOTA_GOSHIMMER_VERSION='0.9.8'
VAR_IOTA_WASP_VERSION='0.2.5'
VAR_SHIMMER_HORNET_VERSION='2.0.0-rc.2'
VAR_SHIMMER_WASP_VERSION='0.3.8'
VAR_SHIMMER_HORNET_VERSION='2.0.0-rc.3'
VAR_SHIMMER_WASP_VERSION='0.4.0-alpha.1'

VAR_INX_INDEXER_VERSION='1.0-rc'
VAR_INX_MQTT_VERSION='1.0-rc'
Expand All @@ -39,22 +39,22 @@ echo "$xx"

InstallerHash=$(curl -L https://github.com/dlt-green/node-installer-docker/releases/download/$VRSN/checksum.txt)

IotaHornetHash='2f4e221d966a4cdbc5f6b5b03e085d055fea7914833bf1e6806f3f6bb4724c23'
IotaHornetHash='49d1b4547e2a2579a92276e2b14e09e7dad46cde5e584ecb6bada707bf1fa0b0'
IotaHornetPackage="https://github.com/dlt-green/node-installer-docker/releases/download/$VRSN/iota-hornet.tar.gz"

IotaBeeHash='e3303c4f46dcb66c74c7a0633c1cf30f1c0252d82c4be9630d4a5c5e49b828c6'
IotaBeeHash='a28954411199cd940aebc9f038fe2e51e2364ccd6cfbbcd9254015e967fe6c96'
IotaBeePackage="https://github.com/dlt-green/node-installer-docker/releases/download/$VRSN/iota-bee.tar.gz"

IotaGoshimmerHash='8ff8e93a51b042c23c083218b2fecea4b243faad0831d66d13953a7b775012b4'
IotaGoshimmerHash='d7a853474885d3322a5b793b9b77e92be47983cdd27fdeab5f56484daaf3edf9'
IotaGoshimmerPackage="https://github.com/dlt-green/node-installer-docker/releases/download/$VRSN/iota-goshimmer.tar.gz"

IotaWaspHash='577a5ffe6010f6f06687f6b4ddf7c5c47280da142a1f4381567536e4422e6283'
IotaWaspPackage="https://github.com/dlt-green/node-installer-docker/releases/download/$VRSN/wasp_iota.tar.gz"

ShimmerHornetHash='82892e49d16ae29d05295157b8cf1a939f99fe1faea950f0be908b8f09252e1c'
ShimmerHornetHash='f4fdca5c01510a724b026aa49e4ab900ea5b154846134dd2fe992251ead24624'
ShimmerHornetPackage="https://github.com/dlt-green/node-installer-docker/releases/download/$VRSN/shimmer-hornet.tar.gz"

ShimmerWaspHash='a30b536c2425b68caaa6932a5644a3a673a03d6d12bf85768b380711ad0eac8a'
ShimmerWaspHash='6a9eab5f2c8a23bbe3c428f5a458fddf25e7ba9f96a6c3ae6f6d381ed759bde0'
ShimmerWaspPackage="https://github.com/dlt-green/node-installer-docker/releases/download/$VRSN/wasp_shimmer.tar.gz"

SnapshotIotaGoshimmer="https://dbfiles-goshimmer.s3.eu-central-1.amazonaws.com/snapshots/nectar/snapshot-latest.bin"
Expand Down Expand Up @@ -2638,7 +2638,7 @@ ShimmerWasp() {
read -r -p '> ' VAR_USERNAME
echo ''
echo "Set the dashboard password:"
echo "(information: $ca""will be saved as text / don't leave it empty""$xx):"
echo "(information: $ca""will be saved as hash / don't leave it empty""$xx):"
read -r -p '> ' VAR_PASSWORD
echo ''

Expand Down Expand Up @@ -2675,6 +2675,26 @@ ShimmerWasp() {
else
if [ -f .env ]; then sed -i "s/WASP_VERSION=.*/WASP_VERSION=$VAR_SHIMMER_WASP_VERSION/g" .env; fi
VAR_HOST=$(cat .env | grep _HOST | cut -d '=' -f 2)
VAR_SALT=$(cat .env | grep DASHBOARD_SALT | cut -d '=' -f 2)

if [ -z $VAR_SALT ]; then
VAR_PASSWORD=$(cat .env | grep DASHBOARD_PASSWORD | cut -d '=' -f 2)

if [ -d /var/lib/shimmer-hornet ]; then cd /var/lib/shimmer-hornet || VAR_PASSWORD=''; fi
if [ -n $VAR_PASSWORD ]; then
credentials=$(docker compose run --rm hornet tool pwd-hash --json --password "$VAR_PASSWORD" | sed -e 's/\r//g')

VAR_DASHBOARD_PASSWORD=$(echo "$credentials" | jq -r '.passwordHash')
VAR_DASHBOARD_SALT=$(echo "$credentials" | jq -r '.passwordSalt')

if [ -d /var/lib/$VAR_DIR ]; then cd /var/lib/$VAR_DIR || exit; fi

if [ -f .env ]; then sed -i "s/DASHBOARD_PASSWORD=.*/DASHBOARD_PASSWORD=$VAR_DASHBOARD_PASSWORD/g" .env; fi
echo "DASHBOARD_SALT=$VAR_DASHBOARD_SALT" >> .env

fi
if [ -d /var/lib/$VAR_DIR ]; then cd /var/lib/$VAR_DIR || exit; fi
fi
fi

echo "$fl"; read -r -p 'Press [Enter] key to continue... Press [STRG+C] to cancel... ' W; echo "$xx"
Expand All @@ -2697,10 +2717,21 @@ ShimmerWasp() {
echo "╚═════════════════════════════════════════════════════════════════════════════╝"
echo ""

VAR_DASHBOARD_PASSWORD=VAR_PASSWORD
if [ -d /var/lib/shimmer-hornet ]; then cd /var/lib/shimmer-hornet || VAR_PASSWORD=''; fi

if [ -n $VAR_PASSWORD ]; then
credentials=$(docker compose run --rm hornet tool pwd-hash --json --password "$VAR_PASSWORD" | sed -e 's/\r//g')

VAR_DASHBOARD_PASSWORD=$(echo "$credentials" | jq -r '.passwordHash')
VAR_DASHBOARD_SALT=$(echo "$credentials" | jq -r '.passwordSalt')

if [ -d /var/lib/$VAR_DIR ]; then cd /var/lib/$VAR_DIR || exit; fi
fi

echo "DASHBOARD_USERNAME=$VAR_USERNAME" >> .env
echo "DASHBOARD_PASSWORD=$VAR_PASSWORD" >> .env
echo "DASHBOARD_PASSWORD=$VAR_DASHBOARD_PASSWORD" >> .env
echo "DASHBOARD_SALT=$VAR_DASHBOARD_SALT" >> .env

fi

echo ""
Expand Down
50 changes: 0 additions & 50 deletions wasp-cli/Dockerfile
View file

This file was deleted.

Loading

0 comments on commit 207e496

Please sign in to comment.