Skip to content

Commit

Permalink
Added missing flags and refactored the command structure.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DeanHnter
DeanHnter committed Feb 6, 2024
1 parent ab3039d commit 6dc8241
Show file tree
Hide file tree
Showing 4 changed files with 210 additions and 113 deletions.
285 changes: 181 additions & 104 deletions Client/cmd/docker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,6 @@ import (
"fmt"
)

var (
DockerCLI *DockerCLIBase
buildOptions shared.BuildOptions // global variable to hold build options
username string
password string
labels []string
)

// DockerCLI provides methods which execute docker commands.
type DockerCLIBase struct {
Service shared.DockerBuilder
Expand All @@ -26,103 +18,181 @@ func NewDockerCLI(service shared.DockerBuilder,kaniko shared.ExecutorInterface)
return DockerCLI
}

var (
DockerCLI *DockerCLIBase
buildOptions shared.BuildOptions // global variable to hold build options
username string
password string
labels []string

var RootCmd = &cobra.Command {
Use: "docker",
Short: "CoreNiko Docker CLI",
Long: `CoreNiko is a Docker CLI Client implementation that uses Kaniko as a backend.`,
}

var buildCmd = &cobra.Command {
Use: "build [OPTIONS] PATH",
Short: "Build an image from a Dockerfile",
Long: `This command is used to build an image from a Dockerfile and can accept extra options like tags.`,
Args: cobra.ExactArgs(1), // Make sure there is at least one argument - the context path
Run: func(cmd *cobra.Command, args []string) {
contextPath := args[0] // The context path is the first argument
// Retrieve the dockerfile path from the --file flag, or use the default "Dockerfile"
dockerfilePath, _ := cmd.Flags().GetString("file")
// Call the build service with the options, context path, and dockerfile path
DockerCLI.Service.BuildImage(buildOptions, contextPath, dockerfilePath)
},
}

var tagCmd = &cobra.Command {
Use: "tag SOURCE_IMAGE[:TAG] TARGET_IMAGE[:TAG]",
Short: "Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE",
Long: `This command is used to create a tag for a source image reference.`,
Run: func(cmd *cobra.Command, args []string) { DockerCLI.Service.TagImage(args) },
}

var pushCmd = &cobra.Command {
Use: "push NAME[:TAG]",
Short: "Push an image or a repository to a registry",
Long: `This command is used to push an image or a repository to a Docker registry.`,
Run: func(cmd *cobra.Command, args []string) { DockerCLI.Service.PushImage(args) },
}

var loginCmd = &cobra.Command {
Use: "login [OPTIONS] [SERVER]",
Short: "Log in to a Docker registry",
Long: `This command is used to log in to a Docker registry. If no server is specified, the default is to log in to the registry at Docker Hub.`,
Run: func(cmd *cobra.Command, args []string) { DockerCLI.Service.Login(args, username, password) },
}

var pullCmd = &cobra.Command{
Use: "pull NAME[:TAG]",
Short: "Pull an image or a repository from a registry",
Long: `This command is used to pull an image or a repository from a Docker registry.`,
Args: cobra.ExactArgs(1), // Expect exactly one argument, the name of the image
Run: func(cmd *cobra.Command, args []string) {
imageName := args[0]
DockerCLI.Service.PullImage(imageName)
},
}

var inspectCmd = &cobra.Command{
Use: "inspect [OPTIONS] NAME|ID [NAME|ID...]",
Short: "Return low-level information on Docker objects",
Long: `Return low-level information on Docker objects, including containers, images, volumes, nodes, networks, services, and more.
By default, docker inspect will render all results in a JSON array. This command is capable of inspecting multiple targets at a time.`,
// Allowing for a variable number of arguments
Args: cobra.MinimumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
// Retrieve flags. This example assumes necessary flags are added to this Cobra command elsewhere in the code.
format, _ := cmd.Flags().GetString("format")
size, _ := cmd.Flags().GetBool("size")
targetType, _ := cmd.Flags().GetString("type")

infoArgs := []string{}

// Adding type flag to arguments if specified
if targetType != "" {
infoArgs = append(infoArgs, "--type="+targetType)
}

// Adding format flag to arguments if specified
if format != "" {
infoArgs = append(infoArgs, "--format="+format)
}

// Adding size flag to arguments if specified
if size {
infoArgs = append(infoArgs, "--size")
}

// Adding the actual object names or IDs to inspect
infoArgs = append(infoArgs, args...)

// Executing inspection with the collected arguments
result, err := DockerCLI.Service.InspectImage(infoArgs)
if err != nil {
return err
}

// Printing result
fmt.Println(result)
return nil
},
}
RootCmd = &cobra.Command {
Use: "docker",
Short: "CoreNiko Docker CLI",
Long: `CoreNiko is a Docker CLI Client implementation that uses Kaniko as a backend.`,
}

buildCmd = &cobra.Command {
Use: "build [OPTIONS] PATH",
Short: "Build an image from a Dockerfile",
Long: `This command is used to build an image from a Dockerfile and can accept extra options like tags.`,
Args: cobra.ExactArgs(1), // Make sure there is at least one argument - the context path
Run: func(cmd *cobra.Command, args []string) {
contextPath := args[0] // The context path is the first argument
// Retrieve the dockerfile path from the --file flag, or use the default "Dockerfile"
dockerfilePath, _ := cmd.Flags().GetString("file")
// Call the build service with the options, context path, and dockerfile path
DockerCLI.Service.BuildImage(buildOptions, contextPath, dockerfilePath)
},
}

tagCmd = &cobra.Command {
Use: "tag SOURCE_IMAGE[:TAG] TARGET_IMAGE[:TAG]",
Short: "Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE",
Long: `This command is used to create a tag for a source image reference.`,
Run: func(cmd *cobra.Command, args []string) { DockerCLI.Service.TagImage(args) },
}

pushCmd = &cobra.Command {
Use: "push NAME[:TAG]",
Short: "Push an image or a repository to a registry",
Long: `This command is used to push an image or a repository to a Docker registry.`,
Run: func(cmd *cobra.Command, args []string) { DockerCLI.Service.PushImage(args) },
}

loginCmd = &cobra.Command {
Use: "login [OPTIONS] [SERVER]",
Short: "Log in to a Docker registry",
Long: `This command is used to log in to a Docker registry. If no server is specified, the default is to log in to the registry at Docker Hub.`,
Run: func(cmd *cobra.Command, args []string) { DockerCLI.Service.Login(args, username, password) },
}

pullCmd = &cobra.Command{
Use: "pull NAME[:TAG]",
Short: "Pull an image or a repository from a registry",
Long: `This command is used to pull an image or a repository from a Docker registry.`,
Args: cobra.ExactArgs(1), // Expect exactly one argument, the name of the image
Run: func(cmd *cobra.Command, args []string) {
imageName := args[0]
DockerCLI.Service.PullImage(imageName)
},
}

inspectCmd = &cobra.Command{
Use: "inspect [OPTIONS] NAME|ID [NAME|ID...]",
Short: "Return low-level information on Docker objects",
Long: `Return low-level information on Docker objects, including containers, images, volumes, nodes, networks, services, and more.
By default, docker inspect will render all results in a JSON array. This command is capable of inspecting multiple targets at a time.`,
// Allowing for a variable number of arguments
Args: cobra.MinimumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
// Retrieve flags. This example assumes necessary flags are added to this Cobra command elsewhere in the code.
format, _ := cmd.Flags().GetString("format")
size, _ := cmd.Flags().GetBool("size")
targetType, _ := cmd.Flags().GetString("type")

infoArgs := []string{}

// Adding type flag to arguments if specified
if targetType != "" {
infoArgs = append(infoArgs, "--type="+targetType)
}

// Adding format flag to arguments if specified
if format != "" {
infoArgs = append(infoArgs, "--format="+format)
}

// Adding size flag to arguments if specified
if size {
infoArgs = append(infoArgs, "--size")
}

// Adding the actual object names or IDs to inspect
infoArgs = append(infoArgs, args...)

// Executing inspection with the collected arguments
result, err := DockerCLI.Service.InspectImage(infoArgs)
if err != nil {
return err
}

// Printing result
fmt.Println(result)
return nil
},
}

imagesCmd = &cobra.Command{
Use: "images [OPTIONS] [REPOSITORY[:TAG]]",
Short: "List images",
Long: `This command lists all the images present locally or from a specific repository with an optional tag.`,
RunE: func(cmd *cobra.Command, args []string) error {
// Retrieving optional flags such as filters or format, assuming necessary flags are added to this command elsewhere in the code.
all, _ := cmd.Flags().GetBool("all")
filters, _ := cmd.Flags().GetStringArray("filter")
format, _ := cmd.Flags().GetString("format")

// Building arguments list for the images command
listArgs := []string{}
if all {
listArgs = append(listArgs, "--all")
}
for _, filter := range filters {
listArgs = append(listArgs, "--filter="+filter)
}
if format != "" {
listArgs = append(listArgs, "--format="+format)
}
// Adding repository and tag if provided
if len(args) > 0 {
listArgs = append(listArgs, args[0])
}

// Executing the images command
result, err := DockerCLI.Service.ListImages(listArgs)
if err != nil {
return err
}

// Printing result
fmt.Println(result)
return nil
},
}

historyCmd = &cobra.Command{
Use: "history [OPTIONS] IMAGE",
Short: "Show the history of an image",
Long: `This command shows the history of an image, including the layers and size information.`,
Args: cobra.ExactArgs(1), // Expect exactly one argument, the name of the image
RunE: func(cmd *cobra.Command, args []string) error {
// Retrieve flags like format or no-trunc, assuming necessary flags are added to this command elsewhere in the code.
format, _ := cmd.Flags().GetString("format")
noTrunc, _ := cmd.Flags().GetBool("no-trunc")

historyArgs := []string{}
if format != "" {
historyArgs = append(historyArgs, "--format="+format)
}
if noTrunc {
historyArgs = append(historyArgs, "--no-trunc")
}

imageName := args[0]
historyArgs = append(historyArgs, imageName)

// Executing the history command with the collected arguments
result, err := DockerCLI.Service.ImageHistory(historyArgs)
if err != nil {
return err
}

fmt.Println(result)
return nil
},
}
)

func init() {
RootCmd.AddCommand(buildCmd)
Expand All @@ -131,12 +201,19 @@ func init() {
RootCmd.AddCommand(loginCmd)
RootCmd.AddCommand(pullCmd)
RootCmd.AddCommand(inspectCmd)
RootCmd.AddCommand(imagesCmd)
RootCmd.AddCommand(historyCmd)
buildCmd.Flags().StringArrayVarP(&buildOptions.Tags, "tag", "t", []string{}, "Name and optionally a tag in the 'name:tag' format")
buildCmd.Flags().StringArrayVar(&labels, "label", []string{}, "Set metadata for an image")
buildCmd.Flags().StringP("file", "f", "Dockerfile", "Name of the Dockerfile")
loginCmd.Flags().StringVarP(&username, "username", "u", "", "Username for registry authentication")
loginCmd.Flags().StringVarP(&password, "password", "p", "", "Password for registry authentication")
inspectCmd.Flags().StringP("type", "", "", "Specify the type of object to inspect (container, image, etc.)")
inspectCmd.Flags().StringP("format", "f", "", "Format the output using the given Go template")
inspectCmd.Flags().BoolP("size", "s", false, "Display total file sizes if the type is container")
inspectCmd.Flags().BoolP("size", "s", false, "Display total file sizes if the type is container")
imagesCmd.Flags().BoolP("all", "a", false, "Show all images (default hides intermediate images)")
imagesCmd.Flags().StringArrayP("filter", "f", []string{}, "Filter output based on conditions provided")
imagesCmd.Flags().StringP("format", "", "", "Pretty-print images using a Go template")
historyCmd.Flags().StringP("format", "", "", "Pretty-print the image history using a Go template")
historyCmd.Flags().BoolP("no-trunc", "", false, "Don't truncate output")
}
31 changes: 26 additions & 5 deletions Client/kaniko/cmd.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"regexp"
"errors"
"os"
auth "github.com/CoreViewInc/CoreNiko/auth"
)

Expand Down Expand Up @@ -53,10 +54,19 @@ func (kd *KanikoDocker) BuildImage(options shared.BuildOptions, contextPath stri
} else {
fmt.Println("KanikoExecutor context is currently:", kanikoExecutor.Context)
}
if len(dockerfilePath) > 0{
kanikoExecutor.Dockerfile = dockerfilePath
}else{
fmt.Println("KanikoExecutor Dockerfile is currently:", kanikoExecutor.Dockerfile)

// Check if dockerfilePath is not empty and the file exists
if len(dockerfilePath) > 0 {
if _, err := os.Stat(dockerfilePath); os.IsNotExist(err) {
fmt.Printf("Dockerfile '%s' does not exist\n", dockerfilePath)
return // Exit the function, or handle the error as needed
} else {
kanikoExecutor.Dockerfile = dockerfilePath
fmt.Println("Setting KanikoExecutor Dockerfile to:", kanikoExecutor.Dockerfile)
}
} else {
fmt.Println("No Dockerfile path provided")
return // Exit the function, or handle the error as needed
}

//build must have atleast a tag otherwise it should generated random uuid
Expand All @@ -74,11 +84,14 @@ func (kd *KanikoDocker) BuildImage(options shared.BuildOptions, contextPath stri
}
for _,stage := range stages{
kanikoExecutor.Destination[0] = stage
kanikoExecutor.Execute()
stdout, stderr, _ := kanikoExecutor.Execute()
fmt.Println(stdout)
fmt.Println(stderr)
}
} else {
fmt.Println("Executor is not of type *KanikoExecutor and does not have a Context field.")
}
fmt.Println("Kaniko build complete.")
}

func (kd *KanikoDocker) TagImage(args []string) {
Expand Down Expand Up @@ -106,3 +119,11 @@ func (kd *KanikoDocker) PullImage(imageName string) error {
return nil
}

func (kd *KanikoDocker) ListImages(args []string) (string, error) {
return "",nil
}

func (kd *KanikoDocker) ImageHistory(args []string) (string, error) {
return "",nil
}

3 changes: 0 additions & 3 deletions Client/kaniko/kaniko.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,10 @@ func (ke *KanikoExecutor) Execute() (string, string, error) {
//ke.Registry.RecordImage(ke.Destination[0], "/path/to/local/image/or/remote/repository")
fmt.Println(args)
cmd := exec.Command("executor", args...)

var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
cmd.Stderr = &stderr
err := cmd.Run()
fmt.Println(stdout.String())
fmt.Println(stderr.String())
return stdout.String(), stderr.String(), err
}

Expand Down
Loading

0 comments on commit 6dc8241

Please sign in to comment.