Skip to content

fix: updated docker compose command #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liorkesos merged 1 commit into from
Jul 17, 2024
Merged

fix: updated docker compose command #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The hossted cli - built to interact with a hossted container
| | hossted set ssl \<AppName\> sign | (TBC) |
| | hossted set remote-support true | To enable or disable remote ssh access with our maintanece and support key |
| logs | hossted logs \<AppName\> | View Application logs |
| ps | hossted ps \<AppName\> | docker-compose ps of the application |
| ps | hossted ps \<AppName\> | docker compose ps of the application |
| version | hossted version | Get the version of the hossted CLI program |
| | | |
| ip | - | (TBC) Get external and internal ip addresses |
Expand Down
4 changes: 2 additions & 2 deletions cmd/ps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ var (
// hossted ps <appName>
var psCmd = &cobra.Command{
Use: "ps",
Short: "[ps] docker-compose ps of the application",
Long: "[ps] docker-compose ps of the application",
Short: "[ps] docker compose ps of the application",
Long: "[ps] docker compose ps of the application",
Example: `
hossted ps
hossted ps <app_name> (e.g. hossted ps wikijs)
Expand Down
2 changes: 1 addition & 1 deletion cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Available Commands:
| help | hossted help | Help about any command |
| logs | hossted log | View application logs |
| status | hossted status | View Hossted status |
| ps | hossted ps | docker-compose ps of the application |
| ps | hossted ps | docker compose ps of the application |
| version | hossted version | Displays the current running version of the CLI |
| update-cli | hossted update-cli | Updates the Hossted CLI to the latest version |
|-------------------------------+-------------------------+--------------------------------------------------------------------------------------------|
Expand Down
4 changes: 2 additions & 2 deletions cmd/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
// hossted ps <appName>
var scanCmd = &cobra.Command{
Use: "scan",
Short: "[scan] docker-compose ps of the application",
Long: "[scan] docker-compose ps of the application",
Short: "[scan] docker compose ps of the application",
Long: "[scan] docker compose ps of the application",
Example: `
hossted scan
hossted scan images
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The hossted cli - built to interact with a hossted container
| | hossted set ssl \<AppName\> sign | (TBC) |
| | hossted set remote-support true | To enable or disable remote ssh access with our maintanece and support key |
| logs | hossted logs \<AppName\> | View Application logs |
| ps | hossted ps \<AppName\> | docker-compose ps of the application |
| ps | hossted ps \<AppName\> | docker compose ps of the application |
| version | hossted version | Get the version of the hossted CLI program |
| | | |
| ip | - | (TBC) Get external and internal ip addresses |
Expand Down
6 changes: 3 additions & 3 deletions hossted/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os/exec"
)

// GetAppLogs goes to the app directory, then calls docker-compose logs
// GetAppLogs goes to the app directory, then calls docker compose logs
// Similar to ListAppPS func
func GetAppLogs(input string, followFlag bool) error {

Expand All @@ -25,9 +25,9 @@ func GetAppLogs(input string, followFlag bool) error {
}
var cmd *exec.Cmd
if followFlag {
cmd = exec.Command("sudo", "docker-compose", "logs", "-f")
cmd = exec.Command("sudo", "docker compose", "logs", "-f")
} else {
cmd = exec.Command("sudo", "docker-compose", "logs")
cmd = exec.Command("sudo", "docker compose", "logs")
}

cmd.Dir = app.AppPath
Expand Down
4 changes: 2 additions & 2 deletions hossted/ps.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/exec"
)

// ListAppPS goes to the app directory, then calls docker-compose ps
// ListAppPS goes to the app directory, then calls docker compose ps
// if input is "", call prompt to get user input, otherwise look up the application in the config
func ListAppPS(input string) error {
var app ConfigApplication
Expand All @@ -20,7 +20,7 @@ func ListAppPS(input string) error {
return err
}

cmd := exec.Command("sudo", "docker-compose", "ps")
cmd := exec.Command("sudo", "docker compose", "ps")
cmd.Dir = app.AppPath

out, err := cmd.Output()
Expand Down
2 changes: 1 addition & 1 deletion hossted/service/compose/reconcile_compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ func runMonitoringCompose(monitoringEnable, osUUID, appUUID string) error {
composeFile := os.Getenv("HOME") + "/.hossted/compose/monitoring/docker-compose.yaml"

// Create the command to run Docker Compose
cmd := exec.Command("docker-compose", "-f", composeFile, "up", "-d")
cmd := exec.Command("docker compose", "-f", composeFile, "up", "-d")

// Set the command's output to the standard output
cmd.Stdout = os.Stdout
Expand Down