diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-14 19:16:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 19:16:03 +0100 |
| commit | dd82acd8ba02be51ec5fea65584e1f7b2036d7c8 (patch) | |
| tree | 653613d8a2998434785b54a77d2488713a708af8 | |
| parent | 0cd22435964573231ab32e545d5f319821b35b14 (diff) | |
| parent | 476ea5645e2ce92dcfcf5d84db58d3155bd3215f (diff) | |
| download | podman-dd82acd8ba02be51ec5fea65584e1f7b2036d7c8.tar.gz podman-dd82acd8ba02be51ec5fea65584e1f7b2036d7c8.tar.bz2 podman-dd82acd8ba02be51ec5fea65584e1f7b2036d7c8.zip | |
Merge pull request #2336 from baude/addbuildtomain
add build to main and as subcommand to image
| -rw-r--r-- | cmd/podman/commands.go | 2 | ||||
| -rw-r--r-- | cmd/podman/image.go | 1 | ||||
| -rw-r--r-- | cmd/podman/main.go | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go index 90e2ab5cf..baa49d2af 100644 --- a/cmd/podman/commands.go +++ b/cmd/podman/commands.go @@ -10,7 +10,6 @@ import ( func getMainCommands() []*cobra.Command { rootCommands := []*cobra.Command{ _attachCommand, - _buildCommand, _commitCommand, _createCommand, _diffCommand, @@ -54,7 +53,6 @@ func getMainCommands() []*cobra.Command { // Commands that the local client implements func getImageSubCommands() []*cobra.Command { return []*cobra.Command{ - _buildCommand, _loadCommand, _saveCommand, _signCommand, diff --git a/cmd/podman/image.go b/cmd/podman/image.go index edc37b28a..4f9c7cd6a 100644 --- a/cmd/podman/image.go +++ b/cmd/podman/image.go @@ -18,6 +18,7 @@ var ( //imageSubCommands are implemented both in local and remote clients var imageSubCommands = []*cobra.Command{ + _buildCommand, _historyCommand, _imageExistsCommand, _imagesCommand, diff --git a/cmd/podman/main.go b/cmd/podman/main.go index a6f0c500a..f9820c075 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -30,6 +30,7 @@ var ( // Commands that the remote and local client have // implemented. var mainCommands = []*cobra.Command{ + _buildCommand, _exportCommand, _historyCommand, _imagesCommand, |