Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(staging): fixes the staging deployment issues caused by the new cli #3266

Merged
merged 2 commits into from
May 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile.staging
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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}/${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
2 changes: 1 addition & 1 deletion config/toml.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down