Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Challenge Task
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OST
BlCh
Challenge Task
Commits
71587add
Commit
71587add
authored
4 months ago
by
David Hintermann
Browse files
Options
Downloads
Plain Diff
Merge branch 'feat-add-relevant-metrics' into feat-add-rebalancer
parents
1ce248a7
1053c55f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!10
feat(rebalancer): rebalance automatically
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.env.sample
+1
-1
1 addition, 1 deletion
.env.sample
Frontend/Frontend.csproj
+1
-0
1 addition, 0 deletions
Frontend/Frontend.csproj
Frontend/Program.cs
+3
-0
3 additions, 0 deletions
Frontend/Program.cs
docker-compose.yml
+10
-2
10 additions, 2 deletions
docker-compose.yml
with
15 additions
and
3 deletions
.env.sample
+
1
−
1
View file @
71587add
...
@@ -4,4 +4,4 @@ POSTGRES_HOST=postgres
...
@@ -4,4 +4,4 @@ POSTGRES_HOST=postgres
POSTGRES_PORT=5432
POSTGRES_PORT=5432
POSTGRES_DB=roesticoin
POSTGRES_DB=roesticoin
POSTGRES_USER=roesticoin
POSTGRES_USER=roesticoin
PROMETHEUS_BASE_URL=http://prometheus:9000
PROMETHEUS_BASE_URL=http://prometheus:9000
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Frontend/Frontend.csproj
+
1
−
0
View file @
71587add
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">
<ItemGroup>
<ItemGroup>
<PackageReference Include="DotNetEnv" Version="3.1.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
<PackageReference Include="Nethereum.Web3" Version="4.26.0" />
<PackageReference Include="Nethereum.Web3" Version="4.26.0" />
...
...
This diff is collapsed.
Click to expand it.
Frontend/Program.cs
+
3
−
0
View file @
71587add
...
@@ -9,12 +9,15 @@ using Frontend.Metrics;
...
@@ -9,12 +9,15 @@ using Frontend.Metrics;
using
Nethereum.Web3
;
using
Nethereum.Web3
;
using
Nethereum.Web3.Accounts
;
using
Nethereum.Web3.Accounts
;
using
Microsoft.EntityFrameworkCore
;
using
Microsoft.EntityFrameworkCore
;
using
DotNetEnv
;
using
OpenTelemetry.Metrics
;
using
OpenTelemetry.Metrics
;
using
OpenTelemetry.Resources
;
using
OpenTelemetry.Resources
;
using
Org.BouncyCastle.Utilities
;
using
Org.BouncyCastle.Utilities
;
using
System.Numerics
;
using
System.Numerics
;
// ensure the env file is loaded
Env
.
Load
(
"../.env"
);
// the location differ in dev and releas mode.
// the location differ in dev and releas mode.
var
tokenAbiLocation
=
Environment
.
GetEnvironmentVariable
(
"TOKEN_ABI_LOCATION"
)!;
var
tokenAbiLocation
=
Environment
.
GetEnvironmentVariable
(
"TOKEN_ABI_LOCATION"
)!;
var
tokenAbi
=
File
.
ReadAllText
(
tokenAbiLocation
)!;
var
tokenAbi
=
File
.
ReadAllText
(
tokenAbiLocation
)!;
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
10
−
2
View file @
71587add
...
@@ -34,13 +34,21 @@ services:
...
@@ -34,13 +34,21 @@ services:
POSTGRES_PASSWORD
:
roesticoin
POSTGRES_PASSWORD
:
roesticoin
volumes
:
volumes
:
-
postgres_data:/var/lib/postgresql/data
-
postgres_data:/var/lib/postgresql/data
pgadmin
:
image
:
dpage/pgadmin4
restart
:
unless-stopped
ports
:
-
"
5050:80"
environment
:
PGADMIN_DEFAULT_EMAIL
:
'
roesti@example.com'
PGADMIN_DEFAULT_PASSWORD
:
'
TheRoestiCoinsPgAdmin'
roesticoin
:
roesticoin
:
env_file
:
env_file
:
-
.env
-
.env
ports
:
ports
:
-
8080:8080
-
8080:8080
depends_on
:
-
postgres
volumes
:
volumes
:
prometheus_data
:
prometheus_data
:
postgres_data
:
postgres_data
:
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment