Skip to content

Commit 8400324

Browse files
committed
use env var for db connection
1 parent 36a3e5a commit 8400324

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

compose.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
services:
2-
backend:
2+
opp-backend:
33
build:
44
context: .
55
dockerfile: Containerfile.dev
66
environment:
7-
- DEBUG_MODE=true
7+
DEBUG_MODE: true
8+
OPP_AUTH_DB_HOST: 172.17.0.1
9+
OPP_AUTH_DB_PORT: 5433
10+
POSTGRES_AUTH_USER: user
11+
POSTGRES_AUTH_PASSWORD: password
12+
POSTGRES_AUTH_DB: db
813
volumes:
914
- .:/src/
1015
ports:
1116
- "8090:8090"
1217
depends_on:
13-
- postgres
14-
postgres:
18+
- opp-postgres-auth
19+
opp-postgres-auth:
1520
image: postgres:latest
1621
environment:
1722
POSTGRES_USER: user

src/db/db.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,24 @@ var initErr error
2323

2424
var schemaPath = "postegres_schema_v1.sql"
2525

26+
var OPP_AUTH_DB_HOST = os.Getenv("OPP_AUTH_DB_HOST")
27+
var OPP_AUTH_DB_PORT = os.Getenv("OPP_AUTH_DB_PORT")
28+
var POSTGRES_AUTH_USER = os.Getenv("POSTGRES_AUTH_USER")
29+
var POSTGRES_AUTH_PASSWORD = os.Getenv("POSTGRES_AUTH_PASSWORD")
30+
var POSTGRES_AUTH_DB = os.Getenv("POSTGRES_AUTH_DB")
31+
2632
func Init() error {
2733
once.Do(func() {
2834
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
2935
defer cancel()
3036

31-
pool, err := pgxpool.New(ctx, "postgres://user:password@172.17.0.1:5432/db")
37+
pool, err := pgxpool.New(ctx, fmt.Sprintf("postgres://%s:%s@%s:%s/%s",
38+
POSTGRES_AUTH_USER,
39+
POSTGRES_AUTH_PASSWORD,
40+
OPP_AUTH_DB_HOST,
41+
OPP_AUTH_DB_PORT,
42+
POSTGRES_AUTH_DB,
43+
))
3244
if err != nil {
3345
initErr = fmt.Errorf("unable to create connection pool: %w", err)
3446
return

0 commit comments

Comments
 (0)