diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..d038294 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +sigplot-data-service +dist/ +.git/ +ui/node_modules/ +sdscache/ +tests diff --git a/sds_types.go b/sds_types.go index d9ec858..d0f0d84 100644 --- a/sds_types.go +++ b/sds_types.go @@ -120,6 +120,7 @@ type Location struct { Location string `json:"location"` MinioAccessKey string `json:"minioAccessKey"` MinioSecretKey string `json:"minioSecretKey"` + MinioUseSSL bool `json:"minioUseSSL"` } // Configuration Struct for Configuraion File diff --git a/sigplot_data_service.go b/sigplot_data_service.go index 822afc6..8bf2887 100644 --- a/sigplot_data_service.go +++ b/sigplot_data_service.go @@ -711,7 +711,12 @@ func openDataSource(url string, urlPosition int) (io.ReadSeeker, string, bool) { file, inCache := getItemFromCache(cacheFileName, "miniocache/") if !inCache { log.Println("Minio File not in local file Cache, Need to fetch") - minioClient, err := minio.New(currentLocation.Location, currentLocation.MinioAccessKey, currentLocation.MinioSecretKey, false) + minioClient, err := minio.New( + currentLocation.Location, + currentLocation.MinioAccessKey, + currentLocation.MinioSecretKey, + currentLocation.MinioUseSSL, + ) elapsed := time.Since(start) log.Println(" Time to Make connection ", elapsed) if err != nil { @@ -1984,7 +1989,7 @@ func (s *fileSystemServer) ServeHTTP(w http.ResponseWriter, r *http.Request) { currentLocation.Location, currentLocation.MinioAccessKey, currentLocation.MinioSecretKey, - false, + currentLocation.MinioUseSSL, ) if err != nil { log.Println("Error Establishing Connection to Minio", err)