فهرست منبع

quickstart flag with one container

sunguroku 5 سال پیش
والد
کامیت
b1c59defd0
6فایلهای تغییر یافته به همراه5 افزوده شده و 9 حذف شده
  1. 0 1
      cmd/migrate/main.go
  2. 0 1
      docker-compose.dev.yaml
  3. 1 1
      docker/.env
  4. 1 1
      docker/dev.Dockerfile
  5. 3 3
      internal/adapter/gorm.go
  6. 0 2
      internal/kubernetes/kubeconfig.go

+ 0 - 1
cmd/migrate/main.go

@@ -24,7 +24,6 @@ func main() {
 
 
 	err = db.AutoMigrate(
 	err = db.AutoMigrate(
 		&models.User{},
 		&models.User{},
-		&models.ClusterConfig{},
 		&models.Session{},
 		&models.Session{},
 	)
 	)
 
 

+ 0 - 1
docker-compose.dev.yaml

@@ -21,7 +21,6 @@ services:
       - ./cmd:/porter/cmd
       - ./cmd:/porter/cmd
       - ./internal:/porter/internal
       - ./internal:/porter/internal
       - ./server:/porter/server
       - ./server:/porter/server
-      - $HOME/.kube/config:/porter/.kubeconfig
   postgres:
   postgres:
     image: postgres:latest
     image: postgres:latest
     container_name: postgres
     container_name: postgres

+ 1 - 1
docker/.env

@@ -12,4 +12,4 @@ DB_PASS=porter
 DB_NAME=porter
 DB_NAME=porter
 COOKIE_SECRETS=secret
 COOKIE_SECRETS=secret
 
 
-ENABLE_AUTH=false
+QUICK_START=true

+ 1 - 1
docker/dev.Dockerfile

@@ -16,4 +16,4 @@ RUN go build -ldflags '-w -s' -a -o ./bin/migrate ./cmd/migrate \
 # for live reloading of go container
 # for live reloading of go container
 RUN go get github.com/cosmtrek/air
 RUN go get github.com/cosmtrek/air
 
 
-CMD air -c .air.toml
+CMD /porter/bin/migrate; air -c .air.toml

+ 3 - 3
internal/adapter/gorm.go

@@ -21,10 +21,10 @@ func New(conf *config.DBConf) (*gorm.DB, error) {
 		conf.Host,
 		conf.Host,
 	)
 	)
 
 
-	if auth, _ := strconv.ParseBool(os.Getenv("ENABLE_AUTH")); auth {
-		return gorm.Open(postgres.Open(dsn), &gorm.Config{})
-	} else {
+	if quickstart, _ := strconv.ParseBool(os.Getenv("QUICK_START")); quickstart {
 		return gorm.Open(sqlite.Open("./internal/porter.db"), &gorm.Config{})
 		return gorm.Open(sqlite.Open("./internal/porter.db"), &gorm.Config{})
+	} else {
+		return gorm.Open(postgres.Open(dsn), &gorm.Config{})
 	}
 	}
 
 
 }
 }

+ 0 - 2
internal/kubernetes/kubeconfig.go

@@ -136,5 +136,3 @@ func createAllowedContextMap(contexts []string) map[string]string {
 
 
 	return aContextMap
 	return aContextMap
 }
 }
-
-// func ReadLocalKubeConfig()