From 41a3279bf8b104f19ade5fe64f02430be6c43c07 Mon Sep 17 00:00:00 2001
From: Pierre-Olivier Mercier <nemunaire@nemunai.re>
Date: Tue, 30 Jul 2019 17:13:55 +0200
Subject: [PATCH] libfic: avoid stange MYSQL_HOST variable, expect IP or DN

---
 docker-compose.yml | 4 ++--
 fickit-backend.yml | 4 ++--
 libfic/db.go       | 7 ++++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 1febdb21..e40197bc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -31,7 +31,7 @@ services:
     depends_on:
       - mysql
     environment:
-      - MYSQL_HOST=tcp(mysql:3306)
+      - MYSQL_HOST=mysql
       - FICCA_PASS
 
   fic-backend:
@@ -49,7 +49,7 @@ services:
     depends_on:
       - mysql
     environment:
-      - MYSQL_HOST=tcp(mysql:3306)
+      - MYSQL_HOST=mysql
 
   fic-frontend:
     build:
diff --git a/fickit-backend.yml b/fickit-backend.yml
index 75642f0b..cf7ac02a 100644
--- a/fickit-backend.yml
+++ b/fickit-backend.yml
@@ -154,7 +154,7 @@ services:
     image: nemunaire/fic-admin:latest
     command: ["/srv/admin", "-bind=:8081", "-baseurl=/admin/", "-localimport=/mnt/fic"]
     env:
-      - MYSQL_HOST=tcp(db:3306)
+      - MYSQL_HOST=db
       - FICCA_PASS=jee8AhloAith1aesCeQu5ahgIegaeM4K
     binds:
       - /etc/hosts:/etc/hosts:ro
@@ -179,7 +179,7 @@ services:
   - name: fic-backend
     image: nemunaire/fic-backend:latest
     env:
-      - MYSQL_HOST=tcp(db:3306)
+      - MYSQL_HOST=db
     binds:
       - /etc/hosts:/etc/hosts:ro
       - /var/lib/fic/teams:/srv/TEAMS
diff --git a/libfic/db.go b/libfic/db.go
index 93e7d959..0ff9c7cd 100644
--- a/libfic/db.go
+++ b/libfic/db.go
@@ -19,7 +19,12 @@ func DSNGenerator() string {
 	db_db := "fic"
 
 	if v, exists := os.LookupEnv("MYSQL_HOST"); exists {
-		db_host = v
+		db_host = "tcp(" + v + ":"
+		if p, exists := os.LookupEnv("MYSQL_PORT"); exists {
+			db_host += p + ")"
+		} else {
+			db_host += "3306)"
+		}
 	}
 	if v, exists := os.LookupEnv("MYSQL_PASSWORD"); exists {
 		db_password = v