dockerised app now runs with mysql db

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-buster as builder
+FROM golang:1.20-buster as builder
 
 WORKDIR /app
 

Makefile

@@ -1,11 +1,15 @@
 SHELL := $(shell which bash)
+DOC_COM := docker compose --project-name gqldenring
 
 generate:
 	go generate ./...
 
 run:
 	go run server.go
 
+run-db:
+	SQL_CONN="root:qwerty@tcp(0.0.0.0:3306)/db" go run server.go
+
 fmt:
 	goimports -w .
 
@@ -16,13 +20,16 @@ tidy:
 	go mod tidy
 
 up:
-	docker compose --project-name gqldenring up -d --build
+	$(DOC_COM) up -d --build --wait
+
+up-db:
+	$(DOC_COM) up -d --wait db phpmyadmin
 
 down:
-	docker compose down
+	$(DOC_COM) down --remove-orphans
 
 logs:
-	docker compose logs -f
+	$(DOC_COM) logs -f
 
 lint:
 	PWD=$(pwd) docker run -t --rm -v ${PWD}:/app -w /app golangci/golangci-lint:latest-alpine golangci-lint run -v

docker-compose.yml

@@ -12,6 +12,7 @@ services:
       - "internal"
     environment:
       PORT: "8080"
+      SQL_CONN: "root:qwerty@tcp(db:3306)/db"
 
   db:
     image: "mysql:8.0.33-oracle"
@@ -37,7 +38,7 @@ services:
       PMA_PASSWORD: "qwerty"
     ports:
       - "9090:80"
-    restart: "always"
+    restart: "on-failure"
     networks:
       - "internal"
 

server.go

@@ -36,9 +36,10 @@ func main() {
 	}
 
 	sqlConn := os.Getenv("SQL_CONN")
+
 	var db graph.DB
 	if sqlConn != "" {
-		log.Printf("[INFO] Using sql db sqlConn=%s", sqlConn)
+		log.Print("[INFO] Using sql db")
 		db = sqlDB.NewDB(sqlConn)
 	} else {
 		log.Print("[INFO] Using in memory db")