fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

libfic: avoid stange MYSQL_HOST variable, expect IP or DN

Browse source
This commit is contained in:
nemunaire 2019-07-30 17:13:55 +02:00
commit 41a3279bf8
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.yml
View file

@ -31,7 +31,7 @@ services:
depends_on: depends_on:
- mysql - mysql
environment: environment:
- MYSQL_HOST=tcp(mysql:3306) - MYSQL_HOST=mysql
- FICCA_PASS - FICCA_PASS
fic-backend: fic-backend:
@ -49,7 +49,7 @@ services:
depends_on: depends_on:
- mysql - mysql
environment: environment:
- MYSQL_HOST=tcp(mysql:3306) - MYSQL_HOST=mysql
fic-frontend: fic-frontend:
build: build:

4
fickit-backend.yml
View file

@ -154,7 +154,7 @@ services:
image: nemunaire/fic-admin:latest image: nemunaire/fic-admin:latest
command: ["/srv/admin", "-bind=:8081", "-baseurl=/admin/", "-localimport=/mnt/fic"] command: ["/srv/admin", "-bind=:8081", "-baseurl=/admin/", "-localimport=/mnt/fic"]
env: env:
- MYSQL_HOST=tcp(db:3306) - MYSQL_HOST=db
- FICCA_PASS=jee8AhloAith1aesCeQu5ahgIegaeM4K - FICCA_PASS=jee8AhloAith1aesCeQu5ahgIegaeM4K
binds: binds:
- /etc/hosts:/etc/hosts:ro - /etc/hosts:/etc/hosts:ro
@ -179,7 +179,7 @@ services:
- name: fic-backend - name: fic-backend
image: nemunaire/fic-backend:latest image: nemunaire/fic-backend:latest
env: env:
- MYSQL_HOST=tcp(db:3306) - MYSQL_HOST=db
binds: binds:
- /etc/hosts:/etc/hosts:ro - /etc/hosts:/etc/hosts:ro
- /var/lib/fic/teams:/srv/TEAMS - /var/lib/fic/teams:/srv/TEAMS

7
libfic/db.go
View file

@ -19,7 +19,12 @@ func DSNGenerator() string {
db_db := "fic" db_db := "fic"
if v, exists := os.LookupEnv("MYSQL_HOST"); exists { 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 { if v, exists := os.LookupEnv("MYSQL_PASSWORD"); exists {
db_password = v db_password = v