Skip to content

Commit 32a5475

Browse files
committed
Overwrite existing compose files, Log latest installer settings.
1 parent 8a9a7cf commit 32a5475

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ nano-node-watchdog/*/*.log
99
/docker-compose.generated.yml
1010
/docker-compose.generated.yml-e
1111
/nano-node-monitor/config.php-e
12+
/settings

setup.sh

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ while getopts 'sqfd:e:t:' flag; do
2626
esac
2727
done
2828

29+
echo $@ > settings
30+
2931
# VERIFY TOOLS INSTALLATIONS
3032
docker -v &> /dev/null
3133
if [ $? -ne 0 ]; then
@@ -80,36 +82,37 @@ fi
8082
docker network create nano-node-network &> /dev/null
8183

8284
if [[ $domain ]]; then
83-
cp -rf docker-compose.letsencrypt.yml docker-compose.generated.yml
8485

8586
if [[ $tag ]]; then
86-
sed -i -e "s/ image: nanocurrency\/nano:latest/ image: nanocurrency\/nano:$tag/g" docker-compose.generated.yml
87+
sed -i -e "s/ image: nanocurrency\/nano:.*/ image: nanocurrency\/nano:$tag/g" docker-compose.letsencrypt.yml
8788
fi
8889

89-
sed -i -e "s/ - VIRTUAL_HOST=mydomain.com/ - VIRTUAL_HOST=$domain/g" docker-compose.generated.yml
90-
sed -i -e "s/ - LETSENCRYPT_HOST=mydomain.com/ - LETSENCRYPT_HOST=$domain/g" docker-compose.generated.yml
91-
sed -i -e "s/ - DEFAULT_HOST=mydomain.com/ - DEFAULT_HOST=$domain/g" docker-compose.generated.yml
90+
sed -i -e "s/ - VIRTUAL_HOST=.*/ - VIRTUAL_HOST=$domain/g" docker-compose.letsencrypt.yml
91+
sed -i -e "s/ - LETSENCRYPT_HOST=.*/ - LETSENCRYPT_HOST=$domain/g" docker-compose.letsencrypt.yml
92+
sed -i -e "s/ - DEFAULT_HOST=.*/ - DEFAULT_HOST=$domain/g" docker-compose.letsencrypt.yml
9293

9394
if [[ $email ]]; then
94-
sed -i -e "s/ - LETSENCRYPT_EMAIL=[email protected]/ - LETSENCRYPT_EMAIL=$email/g" docker-compose.generated.yml
95+
sed -i -e "s/ - LETSENCRYPT_EMAIL=.*/ - LETSENCRYPT_EMAIL=$email/g" docker-compose.letsencrypt.yml
9596
fi
9697

9798
if [[ $quiet = 'false' ]]; then
98-
docker-compose -f docker-compose.generated.yml up -d
99+
docker-compose -f docker-compose.letsencrypt.yml up -d
99100
else
100-
docker-compose -f docker-compose.generated.yml up -d &> /dev/null
101+
docker-compose -f docker-compose.letsencrypt.yml up -d &> /dev/null
101102
fi
103+
102104
else
103105

104106
if [[ $tag ]]; then
105-
sed -i -e "s/ image: nanocurrency\/nano:latest/ image: nanocurrency\/nano:$tag/g" docker-compose.yml
107+
sed -i -e "s/ image: nanocurrency\/nano:.*/ image: nanocurrency\/nano:$tag/g" docker-compose.yml
106108
fi
107109

108110
if [[ $quiet = 'false' ]]; then
109111
docker-compose up -d
110112
else
111113
docker-compose up -d &> /dev/null
112114
fi
115+
113116
fi
114117

115118
if [ $? -ne 0 ]; then

0 commit comments

Comments
 (0)