fix: dir templates

Author: 23doors

pkg/actions/app_add.go

@@ -289,6 +289,12 @@ func (d *AppAdd) promptBasic() error {
 		return errAppAddCanceled
 	}
 
+	// Cleanup.
+	if filepath.IsAbs(d.opts.Dir) {
+		d.opts.Dir, _ = filepath.Rel(d.cfg.Dir, d.opts.Dir)
+		d.opts.Dir = "./" + d.opts.Dir
+	}
+
 	return err
 }
 
@@ -453,13 +459,16 @@ func (d *AppAdd) promptStatic() (*staticAppInfo, error) {
 	}
 
 	// Cleanup.
-	d.opts.StaticBuildDir, _ = filepath.Rel(d.opts.Dir, d.opts.StaticBuildDir)
-	d.opts.StaticBuildDir = "./" + d.opts.StaticBuildDir
+	if filepath.IsAbs(d.opts.StaticBuildDir) {
+		d.opts.StaticBuildDir, _ = filepath.Rel(filepath.Join(d.cfg.Dir, d.opts.Dir), d.opts.StaticBuildDir)
+		d.opts.StaticBuildDir = "./" + d.opts.StaticBuildDir
+	}
 
 	return &staticAppInfo{
 		App: config.StaticApp{
 			BasicApp: config.BasicApp{
 				AppName: d.opts.Name,
+				AppType: config.AppTypeStatic,
 				AppURL:  d.opts.URL,
 				AppDir:  d.opts.Dir,
 				AppRun: &config.AppRun{
@@ -503,6 +512,7 @@ func (d *AppAdd) promptService() (*serviceAppInfo, error) {
 		App: config.ServiceApp{
 			BasicApp: config.BasicApp{
 				AppName: d.opts.Name,
+				AppType: config.AppTypeService,
 				AppURL:  d.opts.URL,
 				AppDir:  d.opts.Dir,
 				AppRun: &config.AppRun{

templates/app-service.yaml.tpl

@@ -13,7 +13,7 @@ dir: {{.App.Dir}}
 type: {{.App.Type}}
 
 # URL of the app.
-url: {{.App.URL}}
+url: {{.App.AppURL}}
 # Path redirect rewrites URL to specified path. URL path from 'url' field will be stripped and replaced with value below.
 # '/' should be fine for most apps.
 pathRedirect: /
@@ -23,7 +23,7 @@ build:
   # Dockerfile name to be used.
   dockerfile: {{.App.Build.Dockerfile}}
   # Directory which is used for dockerfile context.
-  context: {{.App.Build.Context}}
+  context: {{.App.Build.DockerContext}}
 
 # Run defines where how development is handled of application during `ok run`.
 run:

templates/app-static.yaml.tpl

@@ -13,7 +13,7 @@ dir: {{.App.Dir}}
 type: {{.App.Type}}
 
 # URL of the app.
-url: {{.App.URL}}
+url: {{.App.AppURL}}
 # Path redirect rewrites URL to specified path. URL path from 'url' field will be stripped and replaced with value below.
 # '/' should be fine for most apps.
 pathRedirect: /