Skip to content

Commit 81c2531

Browse files
committed
fixes to installers
1 parent 373d7f3 commit 81c2531

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

templates/terraform/subql/base/instances.tf

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ resource "aws_instance" "subql_blue_node" {
4444
provisioner "remote-exec" {
4545
inline = [
4646
"cloud-init status --wait",
47-
"export DEBIAN_FRONTEND=noninteractive",
4847
"sudo apt update -y",
49-
"sudo apt install git curl btop wget gnupg openssl net-tools git -y",
48+
"sudo DEBIAN_FRONTEND=noninteractive apt upgrade -y",
49+
"sudo DEBIAN_FRONTEND=noninteractive apt install git curl btop wget gnupg openssl net-tools git -y",
5050

5151
]
5252

@@ -111,10 +111,9 @@ resource "aws_instance" "subql_green_node" {
111111
provisioner "remote-exec" {
112112
inline = [
113113
"cloud-init status --wait",
114-
"export DEBIAN_FRONTEND=noninteractive",
115114
"sudo apt update -y",
116-
"sudo apt upgrade -y",
117-
"sudo apt install git curl btop wget gnupg openssl net-tools git -y",
115+
"sudo DEBIAN_FRONTEND=noninteractive apt upgrade -y",
116+
"sudo DEBIAN_FRONTEND=noninteractive apt install git curl btop wget gnupg openssl net-tools git -y",
118117

119118
]
120119

@@ -156,7 +155,7 @@ resource "aws_instance" "nova_subql_blue_node" {
156155

157156
tags = {
158157
name = "subql-${var.nova-blue-subql-node-config.network-name}"
159-
Name = "${var.nova-blue-subql-node-config.domain-prefix}-subql-${var.nova-blue-subql-node-config.network-name}"
158+
Name = "${var.nova-blue-subql-node-config.domain-prefix}-${var.nova-blue-subql-node-config.network-name}"
160159
role = "block explorer"
161160
os_name = "ubuntu"
162161
os_version = "22.04"
@@ -178,11 +177,9 @@ resource "aws_instance" "nova_subql_blue_node" {
178177
provisioner "remote-exec" {
179178
inline = [
180179
"cloud-init status --wait",
181-
"export DEBIAN_FRONTEND=noninteractive",
182180
"sudo apt update -y",
183-
"sudo apt upgrade -y",
184-
"sudo apt install git curl btop wget gnupg openssl net-tools git -y",
185-
181+
"sudo DEBIAN_FRONTEND=noninteractive apt upgrade -y",
182+
"sudo DEBIAN_FRONTEND=noninteractive apt install git curl btop wget gnupg openssl net-tools git -y",
186183
]
187184

188185
on_failure = continue
@@ -223,7 +220,7 @@ resource "aws_instance" "nova_subql_green_node" {
223220

224221
tags = {
225222
name = "subql-${var.nova-green-subql-node-config.network-name}"
226-
Name = "${var.nova-green-subql-node-config.domain-prefix}-subql-${var.nova-green-subql-node-config.network-name}"
223+
Name = "${var.nova-green-subql-node-config.domain-prefix}-${var.nova-green-subql-node-config.network-name}"
227224
role = "block explorer"
228225
os_name = "ubuntu"
229226
os_version = "22.04"
@@ -245,11 +242,9 @@ resource "aws_instance" "nova_subql_green_node" {
245242
provisioner "remote-exec" {
246243
inline = [
247244
"cloud-init status --wait",
248-
"export DEBIAN_FRONTEND=noninteractive",
249245
"sudo apt update -y",
250-
"sudo apt upgrade -y",
251-
"sudo apt install git curl btop wget gnupg openssl net-tools git -y",
252-
246+
"sudo DEBIAN_FRONTEND=noninteractiveapt upgrade -y",
247+
"sudo DEBIAN_FRONTEND=noninteractive apt install git curl btop wget gnupg openssl net-tools git -y",
253248
]
254249

255250
on_failure = continue

templates/terraform/subql/base/scripts/install_docker.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/sh
22

33
# updates
4-
export DEBIAN_FRONTEND=noninteractive
54
sudo apt update -y
65

76
# install docker & Docker Compose
@@ -14,7 +13,7 @@ echo \
1413
"$(. /etc/os-release && echo "$VERSION_CODENAME")" stable" | \
1514
sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
1615
sudo apt update -y
17-
sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
16+
sudo DEBIAN_FRONTEND=noninteractive apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin -y
1817

1918
# set max socket connections
2019
if ! (grep -iq "net.core.somaxconn" /etc/sysctl.conf && sed -i 's/.*net.core.somaxconn.*/net.core.somaxconn=65535/' /etc/sysctl.conf); then

0 commit comments

Comments
 (0)