Skip to content

Import github.com/rancher/rancher-compose-executor #41

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
ibuildthecloud merged 5 commits into from
Mar 1, 2017
Merged

Import github.com/rancher/rancher-compose-executor #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e482f8c
Remove scripts/inline_schema.go
joshwget Feb 24, 2017
469748f
Switch to importing github.com/rancher/rancher-compose-executor
joshwget Feb 24, 2017
2fc78dc
Update vendor
joshwget Feb 24, 2017
e64c938
Fixes from rancher-compose-executor import
joshwget Feb 24, 2017
33a64b8
Point to upstream rancher-compose-executor
joshwget Mar 1, 2017
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
10 changes: 5 additions & 5 deletions cmd/up.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package cmd

import (
"github.com/docker/libcompose/project"
rancherApp "github.com/rancher/rancher-compose/app"
"github.com/rancher/rancher-compose-executor/app"
"github.com/rancher/rancher-compose-executor/project"
"github.com/urfave/cli"
)

func UpCommand() cli.Command {
factory := &projectFactory{}
cmd := rancherApp.UpCommand(factory)
cmd := app.UpCommand(factory)
cmd.Flags = append(cmd.Flags, []cli.Flag{
cli.StringFlag{
Name: "rancher-file",
Expand All @@ -35,7 +35,7 @@ func UpCommand() cli.Command {
type projectFactory struct {
}

func (p *projectFactory) Create(c *cli.Context) (project.APIProject, error) {
func (p *projectFactory) Create(c *cli.Context) (*project.Project, error) {
config, err := lookupConfig(c)
if err != nil {
return nil, err
Expand All @@ -59,6 +59,6 @@ func (p *projectFactory) Create(c *cli.Context) (project.APIProject, error) {
c.GlobalSet("file", f)
}

factory := &rancherApp.ProjectFactory{}
factory := &app.RancherProjectFactory{}
return factory.Create(c)
}
3 changes: 0 additions & 3 deletions generate.go
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions scripts/inline_schema.go
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion trash.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ github.com/patrickmn/go-cache 1881a9bccb818787f68c52bfba648c6cf34c34fa
github.com/pkg/errors 1d2e60385a13aaa66134984235061c2f9302520e
github.com/rancher/go-rancher f4560b58215d7eefc74f867a450ded571b731609
github.com/rancher/rancher-catalog-service a3a8b500adceb82b3a0387b2c7b06a60e7eeee9a
github.com/rancher/rancher-compose 1a5c2725c1ce1761d8869be5288a797b619fa0bb
github.com/rancher/rancher-compose-executor 65ba458226af2fe23f8ebbf2f2bab50c9b3e5948
github.com/rancher/rancher-docker-api-proxy 461b5e7022698283030495cf5693680699ce9c28
github.com/Sirupsen/logrus 26709e2714106fb8ad40b773b711ebce25b78914
github.com/spf13/pflag cb88ea77998c3f024757528e3305022ab50b43be
Expand All @@ -33,3 +33,6 @@ golang.org/x/sys eb2c74142fd19a79b3f237334c7384d5167b1b46
golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb
gopkg.in/yaml.v2 e4d366fc3c7938e2958e662b4258c7a89e1f0e3e
github.com/fatih/structs dc3312cb1a4513a366c4c9e622ad55c32df12ed3
github.com/Masterminds/sprig c974324bb59b465f00b128a055656d44f60e4ffc
github.com/aokoli/goutils 9c37978a95bd5c709a15883b6242714ea6709e64
github.com/satori/go.uuid b061729afc07e77a8aa4fad0a2fd840958f1942a
2 changes: 2 additions & 0 deletions vendor/github.com/Masterminds/sprig/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions vendor/github.com/Masterminds/sprig/.travis.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions vendor/github.com/Masterminds/sprig/CHANGELOG.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions vendor/github.com/Masterminds/sprig/LICENSE.txt
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading