Skip to content
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

Support for nerdctl #38

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Support for nerdctl #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be1f5e4
Replace "docker" with "nerdctl" in exec.RunCommand calls
kdambekalns Feb 4, 2022
21512db
Change docker-compose.yaml to compose.yaml internally
kdambekalns Feb 4, 2022
23d4fc8
Drop --remove-orphans from nerdctl compose down
kdambekalns Feb 4, 2022
45bfe7d
Drop --filter from nerdctl ps
kdambekalns Feb 4, 2022
e5c8385
Use "compose down" instead of "compose rm"
kdambekalns Feb 4, 2022
202d36e
Pass project name for database/nginx compose setup
kdambekalns Feb 4, 2022
d7ec420
WIP
kdambekalns Apr 1, 2022
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
1 change: 1 addition & 0 deletions assets/local-beach/docker-compose.yml → assets/local-beach/compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ services:
database:
image: mariadb:10.11
container_name: local_beach_database
user: 501:20
networks:
- local_beach
volumes:
Expand Down
2 changes: 1 addition & 1 deletion assets/project/.localbeach.docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
networks:
local_beach:
external: true
name: local_beach

services:
webserver:
Expand Down
25 changes: 17 additions & 8 deletions cmd/beach/cmd/down.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,17 @@ func handleDownRun(cmd *cobra.Command, args []string) {
log.Fatal(err)
return
}
commandArgs := []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml", "rm", "--force", "--stop", "-v"}
output, err := exec.RunCommand("docker", commandArgs)
commandArgs := []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml", "down", "-v"}
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
}
}

log.Info("Stopping reverse proxy and database server ...")
commandArgs := []string{"compose", "-f", path.Base + "docker-compose.yml", "rm", "--force", "--stop", "-v"}
output, err := exec.RunCommand("docker", commandArgs)
commandArgs := []string{"compose", "-f", path.Base + "compose.yaml", "down", "-v", "-p", "LocalBeach"}
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand All @@ -75,15 +75,24 @@ func handleDownRun(cmd *cobra.Command, args []string) {

func findInstanceRoots() ([]string, error) {
var configurationFiles []string
var containerData []string
var containerID string
var containerName string

output, err := exec.RunCommand("docker", []string{"ps", "-q", "--filter", "network=local_beach"})
output, err := exec.RunCommand("nerdctl", []string{"ps", "--format", "{{.ID}} {{.Names}}"})
if err != nil {
return nil, errors.New(output)
}
for _, line := range strings.Split(output, "\n") {
containerID := strings.TrimSpace(line)
if len(containerID) > 0 {
output, err := exec.RunCommand("docker", []string{"inspect", "-f", "{{index .Config.Labels \"com.docker.compose.project.config_files\"}}", containerID})
containerData = strings.Split(line, " ")
containerID = strings.TrimSpace(containerData[0])
containerName = ""
if len(containerData) > 1 {
containerName = strings.TrimSpace(containerData[1])
}

if len(containerID) > 0 && strings.Contains(containerName, "_devkit") {
output, err := exec.RunCommand("nerdctl", []string{"inspect", "-f", "{{index .Config.Labels \"com.docker.compose.project.config_files\"}}", containerID})
if err != nil {
return nil, errors.New(output)
}
Expand Down
5 changes: 3 additions & 2 deletions cmd/beach/cmd/exec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ package cmd

import (
"fmt"
"strings"

"github.com/flownative/localbeach/pkg/beachsandbox"
"github.com/flownative/localbeach/pkg/exec"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"strings"
)

// execCmd represents the exec command
Expand Down Expand Up @@ -50,7 +51,7 @@ func handleExecRun(cmd *cobra.Command, args []string) {
commandArgs = append(commandArgs, "bash")
}

err = exec.RunInteractiveCommand("docker", commandArgs)
err = exec.RunInteractiveCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(err)
return
Expand Down
4 changes: 2 additions & 2 deletions cmd/beach/cmd/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Docker containers (--containers).`,
if follow {
commandArgs = append(commandArgs, "-f")
}
err = exec.RunInteractiveCommand("docker", commandArgs)
err = exec.RunInteractiveCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(err)
return
Expand All @@ -59,7 +59,7 @@ Docker containers (--containers).`,
commandArgs = append(commandArgs, "bash", "-c", "tail -n -"+strconv.Itoa(tail)+" /application/Data/Logs/*.log")
}

err = exec.RunInteractiveCommand("docker", commandArgs)
err = exec.RunInteractiveCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(err)
return
Expand Down
4 changes: 2 additions & 2 deletions cmd/beach/cmd/pause.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func init() {

func handlePauseRun(cmd *cobra.Command, args []string) {
log.Info("Pausing reverse proxy and database server ...")
commandArgs := []string{"compose", "-f", path.Base + "docker-compose.yml", "stop", "webserver", "database"}
output, err := exec.RunCommand("docker", commandArgs)
commandArgs := []string{"compose", "-f", path.Base + "compose.yaml", "-p", "LocalBeach", "stop", "webserver", "database"}
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand Down
8 changes: 4 additions & 4 deletions cmd/beach/cmd/restart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ func handleRestartRun(cmd *cobra.Command, args []string) {
commandArgs := []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml"}
if restartRemove {
log.Debug("Stopping and removing containers ...")
commandArgs = append(commandArgs, "down", "--remove-orphans", "--volumes")
commandArgs = append(commandArgs, "down", "--volumes")
} else {
log.Debug("Stopping containers ...")
commandArgs = append(commandArgs, "stop")
}

err = exec.RunInteractiveCommand("docker", commandArgs)
err = exec.RunInteractiveCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(err)
return
Expand All @@ -71,7 +71,7 @@ func handleRestartRun(cmd *cobra.Command, args []string) {
if restartPull {
log.Debug("Pulling images ...")
commandArgs = []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml", "pull"}
output, err := exec.RunCommand("docker", commandArgs)
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand All @@ -81,7 +81,7 @@ func handleRestartRun(cmd *cobra.Command, args []string) {
log.Debug("Starting containers ...")

commandArgs = []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml", "up", "--remove-orphans", "-d"}
output, err := exec.RunCommand("docker", commandArgs)
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand Down
4 changes: 2 additions & 2 deletions cmd/beach/cmd/resume.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ func init() {

func handleResumeRun(cmd *cobra.Command, args []string) {
log.Info("Starting reverse proxy and database server ...")
commandArgs := []string{"compose", "-f", path.Base + "docker-compose.yml", "start", "webserver", "database"}
output, err := exec.RunCommand("docker", commandArgs)
commandArgs := []string{"compose", "-f", path.Base + "compose.yaml", "-p", "LocalBeach", "start", "webserver", "database"}
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand Down
9 changes: 5 additions & 4 deletions cmd/beach/cmd/setup-https.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package cmd

import (
"errors"
"strings"

"github.com/flownative/localbeach/pkg/exec"
"github.com/flownative/localbeach/pkg/path"
Expand Down Expand Up @@ -61,15 +62,15 @@ func handleSetupHttpsRun(cmd *cobra.Command, args []string) {
return
}

nginxStatusOutput, err := exec.RunCommand("docker", []string{"ps", "--filter", "name=local_beach_nginx", "--filter", "status=running", "-q"})
statusOutput, err := exec.RunCommand("nerdctl", []string{"ps", "--format", "{{.Names}}"})
if err != nil {
log.Error(errors.New("failed checking status of container local_beach_nginx container"))
}

if len(nginxStatusOutput) != 0 {
if !strings.Contains(statusOutput, "local_beach_nginx") {
log.Info("Restarting reverse proxy ...")
commandArgs = []string{"compose", "-f", path.Base + "docker-compose.yml", "restart"}
output, err := exec.RunCommand("docker", commandArgs)
commandArgs = []string{"compose", "-f", path.Base + "compose.yaml", "-p", "LocalBeach", "restart"}
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand Down
10 changes: 5 additions & 5 deletions cmd/beach/cmd/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ func setupLocalBeach() error {
log.Info("migrating old data from " + path.OldBase + " to " + path.Base)

log.Info("stopping reverse proxy and database server")
commandArgs := []string{"compose", "-f", path.OldBase + "docker-compose.yml", "rm", "--force", "--stop", "-v"}
output, err := exec.RunCommand("docker", commandArgs)
commandArgs := []string{"compose", "-f", path.OldBase + "docker-compose.yml", "down", "-v"}
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Error(output)
}
Expand Down Expand Up @@ -111,13 +111,13 @@ func setupLocalBeach() error {
log.Error(err)
}

composeFileContent := readFileFromAssets("local-beach/docker-compose.yml")
composeFileContent := readFileFromAssets("local-beach/compose.yaml")
composeFileContent = strings.ReplaceAll(composeFileContent, "{{databasePath}}", path.Database)
composeFileContent = strings.ReplaceAll(composeFileContent, "{{certificatesPath}}", path.Certificates)

destination, err := os.Create(filepath.Join(path.Base, "docker-compose.yml"))
destination, err := os.Create(filepath.Join(path.Base, "compose.yaml"))
if err != nil {
log.Error("failed creating docker-compose.yml: ", err)
log.Error("failed creating compose.yaml: ", err)
} else {
_, err = destination.WriteString(composeFileContent)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions cmd/beach/cmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func handleStartRun(cmd *cobra.Command, args []string) {
if startPull {
log.Debug("Pulling images ...")
commandArgs = []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml", "pull"}
output, err := exec.RunCommand("docker", commandArgs)
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand All @@ -64,15 +64,15 @@ func handleStartRun(cmd *cobra.Command, args []string) {

log.Info("Starting project ...")
commandArgs = []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml", "up", "--remove-orphans", "-d"}
output, err := exec.RunCommand("docker", commandArgs)
output, err := exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
}

log.Debug("Creating project database (if needed) ...")
commandArgs = []string{"exec", "local_beach_database", "/bin/bash", "-c", "echo 'CREATE DATABASE IF NOT EXISTS `" + sandbox.ProjectName + "`' | mysql -u root --password=password"}
output, err = exec.RunCommand("docker", commandArgs)
output, err = exec.RunCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(output)
return
Expand Down
2 changes: 1 addition & 1 deletion cmd/beach/cmd/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var statusCmd = &cobra.Command{
}

commandArgs := []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml", "ps"}
err = exec.RunInteractiveCommand("docker", commandArgs)
err = exec.RunInteractiveCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(err)
return
Expand Down
4 changes: 2 additions & 2 deletions cmd/beach/cmd/stop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ func handleStopRun(cmd *cobra.Command, args []string) {
commandArgs := []string{"compose", "-f", sandbox.ProjectRootPath + "/.localbeach.docker-compose.yaml"}

if stopRemove {
commandArgs = append(commandArgs, "down", "--remove-orphans", "--volumes")
commandArgs = append(commandArgs, "down", "--volumes")
} else {
commandArgs = append(commandArgs, "stop")
}

err = exec.RunInteractiveCommand("docker", commandArgs)
err = exec.RunInteractiveCommand("nerdctl", commandArgs)
if err != nil {
log.Fatal(err)
return
Expand Down