Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

cli: enable loading default profiles turnkey #943

Merged
merged 7 commits into from
Mar 29, 2021
Merged

cli: enable loading default profiles turnkey #943

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a4f1911
cli: enable loading default profiles turnkey
adam-stokes Mar 25, 2021
a3cb71f
update NOTICE
adam-stokes Mar 25, 2021
09ef248
Fix additional lint issues in ingest_manager_test
adam-stokes Mar 25, 2021
f4172ea
Cleanup comment and trace log in GetComposeFile
adam-stokes Mar 26, 2021
489d344
Provide better trace feedback if missing docker-compose
adam-stokes Mar 26, 2021
54fa95e
Update cli/config/config.go
adam-stokes Mar 26, 2021
b96d41a
chore: add back traces when extracting the files from the box (#946)
mdelapenya Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions cli/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func FileExists(configFile string) (bool, error) {
}

// GetComposeFile returns the path of the compose file, looking up the
// tool's workdir or in the static resources already packaged in the binary
// tool's workdir
func GetComposeFile(isProfile bool, composeName string) (string, error) {
composeFileName := "docker-compose.yml"
serviceType := "services"
Expand All @@ -91,12 +91,6 @@ func GetComposeFile(isProfile bool, composeName string) (string, error) {
return composeFilePath, nil
}

log.WithFields(log.Fields{
adam-stokes marked this conversation as resolved.
Show resolved Hide resolved
"composeFilePath": composeFilePath,
"error": err,
"type": serviceType,
}).Trace("Compose file not found at workdir. Extracting from binary resources")

if err != nil {
log.WithFields(log.Fields{
"composeFileName": composeFileName,
Expand Down