Update Makefile, compose and swagger dependencies

.gitignore

@@ -1,6 +1,7 @@
 .DS_Store
 .idea/
 .env
+api
 tls/*.pem
 cmd/dataloader
 cp.out

Makefile

@@ -11,7 +11,7 @@ db:
 all: build
 
 certs: ## Generate TLS cert files
-	cd tls && go run /usr/local/go/src/crypto/tls/generate_cert.go --rsa-bits=2048 --host=localhost
+	cd tls && go run /usr/local/go/src/crypto/tls/generate_cert.go --rsa-bits=2048 --host=localhost && cd ../
 
 lint: ## Lint the files
 	@golint -set_exit_status ${PKG_LIST}
@@ -34,8 +34,8 @@ coverhtml: ## Generate global code coverage report in HTML
 dep: ## Get the dependencies
 	@go get -v -d -t ./...
 
-build: dep ## Build the binary file
-	@go build -i -v $(PKG)
+build_api: dep ## Build the binary file
+	@go build -i -v -o api ./cmd/api/.
 
 clean: ## Remove previous build
 	@rm -f $(PROJECT_NAME)

cmd/api/main.go

@@ -82,6 +82,7 @@ func main() {
 	db, err := openDB(dsn)
 
 	if err != nil {
+		infoLog.Output(1, fmt.Sprintf("DSN: %s", dsn))
 		errorLog.Fatal(err)
 	}
 	db.SetMaxIdleConns(50)

docker-compose.yml

@@ -4,10 +4,10 @@ services:
     container_name: morellis-mysql
     image: mysql:5.7
     environment:
-      MYSQL_ROOT_PASSWORD: password
-      MYSQL_DATABASE: morellis
-      MYSQL_USER: morellis
-      MYSQL_PASSWORD: E4j+#2G^8Pa=^Nn9
+      MYSQL_ROOT_PASSWORD: ${DB_ROOT_PASS:-password}
+      MYSQL_DATABASE: ${DB_DATABASE:-}morellis
+      MYSQL_USER: ${DB_USER:-morellis}
+      MYSQL_PASSWORD: ${DB_PASS}
     volumes:
       - ./sql:/docker-entrypoint-initdb.d
       - ./data:/var/lib/mysql

go.mod

@@ -29,3 +29,5 @@ require (
 	google.golang.org/appengine v1.4.0 // indirect
 	googlemaps.github.io/maps v0.0.0-20190206003505-be134e760d70
 )
+
+go 1.13