update docker sim

Dockerfile

@@ -1,4 +1,6 @@
-FROM golang:1.15-alpine as build-stage
+FROM golang:alpine as build-stage
+ENV GO111MODULE=on
+ENV CGO_ENABLED=0
 
 RUN apk add --no-cache make git
 

Makefile

@@ -63,6 +63,8 @@ ifeq ($(COVERAGE),1)
 	TEST_FLAGS := $(TEST_FLAGS) $(COVERAGE_FLAGS)
 endif
 
+COMPOSE_FILE:=docker-compose.yaml
+
 $(GO_LINT):
 	$(GO_GET) $(GO_LINT_REPO)
 
@@ -138,19 +140,23 @@ image: ## Build the Docker image
 	docker build .
 
 gothic:  ## Start gothic
-	docker-compose -f docker-compose.yaml up -d gothic
+	docker compose -f $(COMPOSE_FILE) up -d gothic
 
 envoy: ## Start envoy
-	docker-compose -f docker-compose.yaml up -d envoy
+	docker compose -f $(COMPOSE_FILE) up -d envoy
 
+mysql: COMPOSE_FILE?=docker-compose-dev.yaml
 mysql: ## Start mysql
-	docker-compose -f docker-compose-dev.yaml up -d mysql
+	docker compose -f $(COMPOSE_FILE) up -d mysql
 
+pg: COMPOSE_FILE?=docker-compose-dev.yaml
 pg: ## Start postgres
-	docker-compose -f docker-compose-dev.yaml up -d pg
+	docker compose -f $(COMPOSE_FILE) up -d pg
 
 db: mysql ## Start mysql db
 
+sim: COMPOSE_FILE:=docker-compose.yaml -f docker-compose-dev.yaml
+sim: COMPOSE_ENV:=./env/sim.env
 sim: db envoy gothic
 
 .PHONY: help fmt vet lint audit static tidy deps rpc test build \

codecov.yaml

@@ -15,3 +15,4 @@ ignore:
   - "test/"
   - "cmd/"
   - "api/"
+  - "core/signup_debug.go"

docker-compose-dev.yaml

@@ -2,6 +2,10 @@ version: "3.8"
 
 services:
 
+  gothic:
+    depends_on:
+      - mysql
+
   mysql:
     image: mysql:latest
     command: --init-file /data/application/init.sql

env/dev.env

@@ -9,9 +9,7 @@ GOTHIC_JWT_SECRET="secret"
 
 GOTHIC_HOST=localhost
 
-GOTHIC_DB_NAMESPACE=gothic_dev
 GOTHIC_DB_AUTOMIGRATE=true
-
 GOTHIC_DB_DRIVER=mysql
 GOTHIC_DB_DSN="root@tcp(localhost:3306)/dev?parseTime=true"
 

env/sim.env

@@ -9,10 +9,10 @@ GOTHIC_JWT_SECRET="secret"
 
 GOTHIC_HOST=0.0.0.0
 
-GOTHIC_DB_DRIVER=mysql
-GOTHIC_DB_DSN="root@tcp(mysql_db:3306)/dev?parseTime=true"
 GOTHIC_DB_AUTOMIGRATE=true
-
-GOTHIC_SIGNUP_AUTOCONFIRM=true
+GOTHIC_DB_DRIVER=mysql
+GOTHIC_DB_DSN="root@tcp(host.docker.internal:3306)/dev?parseTime=true"
 
 GOTHIC_LOG_LEVEL=info
+
+GOTHIC_SIGNUP_AUTOCONFIRM=true

env/test.env

@@ -3,6 +3,9 @@ GOTHIC_SITE_URL=https://www.example.com
 GOTHIC_ROOT_PASSWORD=password
 GOTHIC_JWT_SECRET="TEST-SECRET"
 
+GOTHIC_DB_NAMESPACE=test
+GOTHIC_DB_AUTOMIGRATE=true
+
 # sqlite
 GOTHIC_DB_DRIVER=sqlite
 GOTHIC_DB_DSN=build
@@ -16,6 +19,3 @@ GOTHIC_DB_DSN=build
 # GOTHIC_DB_DSN="postgres://root:[email protected]:5432/test"
 
 # GOTHIC_LOG_LEVEL=debug
-
-GOTHIC_DB_NAMESPACE=test
-GOTHIC_DB_AUTOMIGRATE=true