forked from toolshed/abra
		
	refactor(recipe): rename Recipe2 -> Recipe
This commit is contained in:
		@ -318,7 +318,7 @@ func getAvailableUpgrades(cl *dockerclient.Client, stackName string, recipeName
 | 
			
		||||
 | 
			
		||||
// processRecipeRepoVersion clones, pulls, checks out the version and lints the
 | 
			
		||||
// recipe repository.
 | 
			
		||||
func processRecipeRepoVersion(r recipe.Recipe2, version string) error {
 | 
			
		||||
func processRecipeRepoVersion(r recipe.Recipe, version string) error {
 | 
			
		||||
	if err := r.EnsureExists(); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
	}
 | 
			
		||||
@ -355,7 +355,7 @@ func mergeAbraShEnv(recipeName string, env envfile.AppEnv) error {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// createDeployConfig merges and enriches the compose config for the deployment.
 | 
			
		||||
func createDeployConfig(r recipe.Recipe2, stackName string, env envfile.AppEnv) (*composetypes.Config, stack.Deploy, error) {
 | 
			
		||||
func createDeployConfig(r recipe.Recipe, stackName string, env envfile.AppEnv) (*composetypes.Config, stack.Deploy, error) {
 | 
			
		||||
	env["STACK_NAME"] = stackName
 | 
			
		||||
 | 
			
		||||
	deployOpts := stack.Deploy{
 | 
			
		||||
@ -438,12 +438,12 @@ func upgrade(cl *dockerclient.Client, stackName, recipeName,
 | 
			
		||||
 | 
			
		||||
	app := appPkg.App{
 | 
			
		||||
		Name:   stackName,
 | 
			
		||||
		Recipe: recipe.Get2(recipeName),
 | 
			
		||||
		Recipe: recipe.Get(recipeName),
 | 
			
		||||
		Server: SERVER,
 | 
			
		||||
		Env:    env,
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	r := recipe.Get2(recipeName)
 | 
			
		||||
	r := recipe.Get(recipeName)
 | 
			
		||||
 | 
			
		||||
	if err = processRecipeRepoVersion(r, upgradeVersion); err != nil {
 | 
			
		||||
		return err
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user