fix: tweak test ci

.github/workflows/ci.yml

@@ -9,6 +9,7 @@ on:
 env:
   JEPP_ENV: ci
   JEPP_DB_HOST: localhost
+  JEPP_DB_PASSWORD: root
 
 jobs:
   test-with-db:

.github/workflows/pub.yml

@@ -39,11 +39,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Build image
-        run: docker compose build
-
-      - name: Tag image
-        run: |
-          docker tag jepp-app:latest registry.digitalocean.com/shreggie/jepp:latest
+        run: docker build . -t registry.digitalocean.com/shreggie/jepp:latest
 
       - name: Install doctl
         uses: digitalocean/action-doctl@v2

Taskfile.yml

@@ -47,7 +47,7 @@ tasks:
       - pkg/models/*
       - pkg/utils/*
     cmds:
-      - task: docker:run
+      - task: server:run
 
   genswag:
     desc: Generates swagger docs for the API.

docker-compose.yml

@@ -6,8 +6,6 @@ services:
     restart: unless-stopped
     environment:
       MARIADB_DATABASE: jeppdb
-      MARIADB_USER: jepp
-      MARIADB_PASSWORD: jepp
       MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true
       MARIADB_MYSQL_LOCALHOST_USER: true
     ports:
@@ -30,6 +28,7 @@ services:
     environment:
       JEPP_ENV: ${JEPP_ENV}
       JEPP_DB_HOST: db
+      JEPP_DB_PASSWORD: ""
     ports:
       - 8880:8880
     depends_on:

pkg/models/db.go

@@ -25,17 +25,14 @@ func GetDBHandle() *sqlx.DB {
 
 	cfg := mysql.NewConfig()
 	cfg.User = "root"
+	cfg.Passwd = os.Getenv("JEPP_DB_PASSWORD")
 	cfg.DBName = "jeppdb"
 	cfg.Net = "tcp"
 	cfg.Addr = fmt.Sprintf("%s:3306", os.Getenv("JEPP_DB_HOST"))
 	cfg.AllowNativePasswords = true
 	cfg.ParseTime = true
 	cfg.MaxAllowedPacket = 64 << 20
 
-	if os.Getenv("JEPP_ENV") == "ci" {
-		cfg.Passwd = "root"
-	}
-
 	// Get a database handle.
 	db = sqlx.MustOpen("mysql", cfg.FormatDSN())
 	log.Debug("created new database handle", "db", db)