Skip to content

Commit

Permalink
Remove DB + Refactoring (#11)
Browse files Browse the repository at this point in the history
Co-authored-by: John Marcou <[email protected]>
  • Loading branch information
harrysolovay and johnmarcou authored Sep 18, 2024
1 parent ca22c2a commit dab29da
Show file tree
Hide file tree
Showing 41 changed files with 969 additions and 1,302 deletions.
11 changes: 3 additions & 8 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
# [REQUIRED] - the connection URL for the application database.
DB_USER=granola
DB_PASS=systems
DB_HOST=127.0.0.1
DB_PORT=5432
DB_NAME=db
DATABASE_URL=postgresql://granola:[email protected]:5432/db
# The path from which to fetch the proposals manifest. Empty defaults to the MinaFoundation/mina-on-chain-voting GitHub.
PROPOSALS_URL=""

BUCKET_NAME="673156464838-mina-staking-ledgers"

Expand Down Expand Up @@ -43,4 +38,4 @@ NEXT_PUBLIC_API_BASE_URL=http://127.0.0.1:8080
# SKIP_ENV_VALIDATION=1

# Sets the log level for the server. Must be on 'debug' for testing.
RUST_LOG=debug
RUST_LOG=debug,error,info
20 changes: 0 additions & 20 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,42 +1,22 @@
services:
web:
container_name: web
profiles: ["all", "web"]
build:
context: ./web
dockerfile: Dockerfile
env_file: .env
environment:
- API_BASE_URL=http://server:8080
- NEXT_PUBLIC_API_BASE_URL=http://server:8080
- RELEASE_STAGE=production
ports:
- 3000:3000
server:
container_name: server
profiles: ["all", "server-db", "server"]
image: ocv-server
build:
context: ./server
dockerfile: Dockerfile
# dockerfile: Dockerfile.dev
env_file: .env
environment:
- DB_HOST=db
- DATABASE_URL=postgresql://granola:systems@db:5432/db
ports:
- 8080:8080
depends_on:
- db
db:
container_name: postgres
profiles: ["all", "server-db", "db"]
image: postgres:15.2
ports:
- 5432:5432
environment:
POSTGRES_USER: granola
POSTGRES_PASSWORD: systems
POSTGRES_DB: db
tmpfs:
- /var/lib/postgresql/data
1 change: 1 addition & 0 deletions rustfmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ overflow_delimited_expr = true
spaces_around_ranges = true
tab_spaces = 2
use_field_init_shorthand = true
use_small_heuristics = "Max"
use_try_shorthand = true
version = "Two"
wrap_comments = true
Loading

0 comments on commit dab29da

Please sign in to comment.