Skip to content

Commit 03c0046

Browse files
committed
Remove docker files. To add them later
1 parent 11ba4f7 commit 03c0046

File tree

5 files changed

+47
-62
lines changed

5 files changed

+47
-62
lines changed

.env

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@ DB_DRIVER=mysql
44
DB_USER=steven
55
DB_PASSWORD=here
66
DB_NAME=fullstack_api
7-
# used for docker
8-
DB_HOST=db
97

108

119
TestApiPort=8888
1210
TestApiSecret=98hbun98h
1311
TestDbDriver=mysql
1412
TestDbUser=steven
1513
TestDbPassword=here
16-
TestDbName=fullstack_api_test
17-
# used for docker
18-
TestDbHost=db
14+
TestDbName=fullstack_api_test

Dockerfile

-28
This file was deleted.

api/server.go

+45-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,60 @@
11
package api
22

33
import (
4+
"fmt"
5+
"log"
6+
"os"
7+
"strconv"
8+
9+
"github.com/joho/godotenv"
410
"github.com/victorsteven/fullstack/api/controllers"
511
"github.com/victorsteven/fullstack/api/seed"
6-
"github.com/victorsteven/fullstack/config"
712
)
813

914
var server = controllers.Server{}
1015

16+
var (
17+
PORT = 0
18+
SECRETKEY []byte
19+
DBURL = ""
20+
DBDRIVER = ""
21+
DBUSER = ""
22+
DBPASSWORD = ""
23+
DBNAME = ""
24+
)
25+
26+
func Load() {
27+
28+
var err error
29+
err = godotenv.Load()
30+
if err != nil {
31+
log.Fatalf("Error getting env, not comming through %v", err)
32+
} else {
33+
fmt.Println("We are getting the env values")
34+
}
35+
PORT, err = strconv.Atoi(os.Getenv("API_PORT"))
36+
if err != nil {
37+
PORT = 8000
38+
}
39+
DBHOST := os.Getenv("DB_HOST")
40+
if DBHOST == "" {
41+
DBHOST = "127.0.0.1"
42+
}
43+
DBDRIVER = os.Getenv("DB_DRIVER")
44+
DBUSER = os.Getenv("DB_USER")
45+
DBPASSWORD = os.Getenv("DB_PASSWORD")
46+
DBNAME = os.Getenv("DB_NAME")
47+
SECRETKEY = []byte(os.Getenv("API_SECRET"))
48+
49+
}
50+
1151
func Run() {
1252

13-
config.Load()
53+
Load()
54+
55+
// config.Load()
1456

15-
server.Initialize(config.DBDRIVER, config.DBUSER, config.DBPASSWORD, config.DBNAME)
57+
server.Initialize(DBDRIVER, DBUSER, DBPASSWORD, DBNAME)
1658

1759
seed.Load(server.DB)
1860

config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func Load() {
2424
var err error
2525
err = godotenv.Load()
2626
if err != nil {
27-
log.Fatalf("Error getting env %v", err)
27+
log.Fatalf("Error getting env, not comming through %v", err)
2828
} else {
2929
fmt.Println("We are getting the env values")
3030
}

docker-compose.yml

-25
This file was deleted.

0 commit comments

Comments
 (0)