From bc11cfc1b1e6f5f7574fc4816cb1986ab9fef036 Mon Sep 17 00:00:00 2001
From: kanishka <kanishkatn@gmail.com>
Date: Thu, 18 May 2023 12:00:28 +0530
Subject: [PATCH 1/2] fix docker

---
 Dockerfile.staging | 6 +++---
 docker-compose.yml | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.staging b/Dockerfile.staging
index 191da0a79b..0f0062bf8e 100644
--- a/Dockerfile.staging
+++ b/Dockerfile.staging
@@ -5,7 +5,7 @@ ARG basepath="~/.gossamer"
 ARG DD_API_KEY
 
 ENV chain=${chain}
-ENV basepath=${basepath}
+ENV GSSMRHOME=${basepath}
 ENV DD_API_KEY=${DD_API_KEY}
 ENV DD_HOSTNAME=${chain}-host
 
@@ -19,6 +19,6 @@ RUN ["sh", "-c", "mv .github/workflows/staging/openmetrics.d/${chain}-conf.yaml
 RUN go get ./...
 RUN go install -trimpath github.com/ChainSafe/gossamer/cmd/gossamer
 
-RUN ["sh", "-c", "gossamer init --chain=${chain}"]
-ENTRYPOINT ["sh", "-c", "service datadog-agent start && gossamer --chain=${chain} --basepath=${basepath}/${chain} --publish-metrics --metrics-address=\":9876\" --pprofserver --pprofaddress=\":6060\""]
+RUN ["sh", "-c", "gossamer init --chain=${chain} --base-path=${basepath}"]
+ENTRYPOINT ["sh", "-c", "service datadog-agent start && gossamer --chain=${chain} --base-path=${basepath} --prometheus-external --prometheus-port=9876 --pprof.enabled --pprof.listening-address=\":6060\""]
 EXPOSE 7001 8546 8540 9876 6060
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8a300720e2..b1764592cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,12 +21,12 @@ services:
             # Remove with: docker volume rm gossamer
             - gossamer:/data/gossamer
         command:
-            - --basepath=/data/gossamer
+            - --base-path=/data/gossamer
             - --chain=kusama
             - --log=info
-            - --publish-metrics
-            - --metrics-address=:9876
-            - --pprofserver
+            - --prometheus-external
+            - --prometheus-port=9876
+            - --pprof.enabled
         ports:
             - 6060:6060/tcp # Pprof server
             - 7001:7001/tcp # Network port

From 102f5926302f7d892149010c4deb397cf9dfd03a Mon Sep 17 00:00:00 2001
From: kanishka <kanishkatn@gmail.com>
Date: Thu, 18 May 2023 13:01:11 +0530
Subject: [PATCH 2/2] fix toml

---
 Dockerfile.staging | 4 ++--
 config/toml.go     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.staging b/Dockerfile.staging
index 0f0062bf8e..dd73e7e51b 100644
--- a/Dockerfile.staging
+++ b/Dockerfile.staging
@@ -19,6 +19,6 @@ RUN ["sh", "-c", "mv .github/workflows/staging/openmetrics.d/${chain}-conf.yaml
 RUN go get ./...
 RUN go install -trimpath github.com/ChainSafe/gossamer/cmd/gossamer
 
-RUN ["sh", "-c", "gossamer init --chain=${chain} --base-path=${basepath}"]
-ENTRYPOINT ["sh", "-c", "service datadog-agent start && gossamer --chain=${chain} --base-path=${basepath} --prometheus-external --prometheus-port=9876 --pprof.enabled --pprof.listening-address=\":6060\""]
+RUN ["sh", "-c", "gossamer init --chain=${chain} --base-path=${basepath}/${chain}"]
+ENTRYPOINT ["sh", "-c", "service datadog-agent start && gossamer --chain=${chain} --base-path=${basepath}/${chain} --prometheus-external --prometheus-port=9876 --pprof.enabled --pprof.listening-address=\":6060\""]
 EXPOSE 7001 8546 8540 9876 6060
\ No newline at end of file
diff --git a/config/toml.go b/config/toml.go
index 4c7b550724..3cecdfaa99 100644
--- a/config/toml.go
+++ b/config/toml.go
@@ -177,7 +177,7 @@ unlock = "{{ .Account.Unlock }}"
 port = {{ .Network.Port }}
 
 # Comma separated node URLs for network discovery bootstrap
-bootnodes = "{{ StringsJoin .Network.Bootnodes ", " }}"
+bootnodes = "{{ StringsJoin .Network.Bootnodes "," }}"
 
 # Protocol ID to use
 protocol-id = "{{ .Network.ProtocolID }}"