Skip to content

Commit 9b5aeb2

Browse files
committed
Update db env var name
1 parent 5f6b6f8 commit 9b5aeb2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,12 @@ build-migrations:
8484
run-migrations: build-migrations
8585
docker run --network host assignment-migration \
8686
$(action) $(version) \
87-
"mysql://$(ASSIGNMENT_DB_USER):$(ASSIGNMENT_DB_PASSWORD)@tcp($(ASSIGNMENT_DB_HOST):$(ASSIGNMENT_DB_PORT))/$(ASSIGNMENT_DB_NAME)"
87+
"mysql://$(ASSIGNMENT_DB_USER):$(ASSIGNMENT_DB_PASSWORD)@tcp($(ASSIGNMENT_DB_HOST):$(ASSIGNMENT_DB_PORT))/$(ASSIGNMENT_DB)"
8888

8989
migrate-latest: build-migrations
9090
docker run --network host assignment-migration \
9191
goto $(LAST_MIGRATION) \
92-
"mysql://$(ASSIGNMENT_DB_USER):$(ASSIGNMENT_DB_PASSWORD)@tcp($(ASSIGNMENT_DB_HOST):$(ASSIGNMENT_DB_PORT))/$(ASSIGNMENT_DB_NAME)"
92+
"mysql://$(ASSIGNMENT_DB_USER):$(ASSIGNMENT_DB_PASSWORD)@tcp($(ASSIGNMENT_DB_HOST):$(ASSIGNMENT_DB_PORT))/$(ASSIGNMENT_DB)"
9393

9494
db-seed:
9595
@echo "Seeding db"

migrations/migrate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ db=$3
77
if [ "$action" = "composeup" ]; then
88
/migrations/migrate \
99
-source file:///migrations \
10-
-database "mysql://$ASSIGNMENT_DB_USER:$ASSIGNMENT_DB_PASSWORD@tcp($ASSIGNMENT_DB_HOST:$ASSIGNMENT_DB_PORT)/$ASSIGNMENT_DB_NAME" \
10+
-database "mysql://$ASSIGNMENT_DB_USER:$ASSIGNMENT_DB_PASSWORD@tcp($ASSIGNMENT_DB_HOST:$ASSIGNMENT_DB_PORT)/$ASSIGNMENT_DB" \
1111
up
1212
exit 0
1313
fi

pkg/database/database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const connMaxLifetime = time.Second * 5
1414
func Connect() (*sqlx.DB, error) {
1515
host := os.Getenv("ASSIGNMENT_DB_HOST")
1616
port := os.Getenv("ASSIGNMENT_DB_PORT")
17-
name := os.Getenv("ASSIGNMENT_DB_NAME")
17+
name := os.Getenv("ASSIGNMENT_DB")
1818
user := os.Getenv("ASSIGNMENT_DB_USER")
1919
password := os.Getenv("ASSIGNMENT_DB_PASSWORD")
2020
if password != "" {

0 commit comments

Comments
 (0)