docs: update examples to config v1beta9

Author: FabianKramm

cmd/open.go

@@ -77,7 +77,7 @@ devspace open
 	}
 
 	openCmd.Flags().StringVar(&cmd.Provider, "provider", "", "The cloud provider to use")
-	openCmd.Flags().IntVar(&cmd.Port, "port", 0, "The cloud provider to use")
+	openCmd.Flags().IntVar(&cmd.Port, "port", 0, "The port on the localhost to listen on")
 
 	return openCmd
 }

cmd/ui.go

@@ -73,7 +73,7 @@ func (cmd *UICmd) RunUI(f factory.Factory, cobraCmd *cobra.Command, args []strin
 	}
 
 	// Search for an already existing server
-	if cmd.ForceServer == false && cmd.Dev == false {
+	if cmd.ForceServer == false && cmd.Dev == false && cmd.Host == "localhost" {
 		checkPort := server.DefaultPort
 		if cmd.Port != 0 {
 			checkPort = cmd.Port

examples/dependencies/dependency1/devspace.yaml

@@ -1,15 +1,15 @@
 version: v1beta8
 images:
   default:
-    image: dscr.io/${DEVSPACE_USERNAME}/devspace
+    image: mydockeruser/devspace
     createPullSecret: true
 deployments:
 - name: dependency1
   helm:
     componentChart: true
     values:
       containers:
-      - image: dscr.io/${DEVSPACE_USERNAME}/devspace
+      - image: mydockeruser/devspace
 dependencies:
 - source:
     path: ../dependency2

examples/hooks/devspace.yaml

@@ -1,14 +1,14 @@
-version: v1beta5
+version: v1beta9
 images:
   default:
-    image: dscr.io/${DEVSPACE_USERNAME}/devspace
+    image: mydockeruser/devspace
 deployments:
 - name: my-deployment
   helm:
     componentChart: true
     values:
       containers:
-      - image: dscr.io/${DEVSPACE_USERNAME}/devspace
+      - image: mydockeruser/devspace
 hooks:
 - command: echo
   args:

examples/kustomize/devspace.yaml

@@ -1,4 +1,4 @@
-version: v1beta5
+version: v1beta9
 images:
   default:
     image: yourusername/devspace

examples/microservices/devspace.yaml

@@ -2,7 +2,7 @@
 # If you want to try this example in other
 # Clusters you have to exchange the image names
 # and enable image pushing
-version: v1beta5
+version: v1beta9
 images:
   node:
     image: node

examples/minikube/devspace.yaml

@@ -1,4 +1,4 @@
-version: v1beta5
+version: v1beta9
 images:
   default:
     image: devspace

examples/php-mysql-example/devspace.yaml

@@ -1,7 +1,7 @@
-version: v1beta5
+version: v1beta9
 images:
   default:
-    image: dscr.io/${DEVSPACE_USERNAME}/devspace
+    image: mydockeruser/devspace
 deployments:
 - name: mysql
   helm:
@@ -31,7 +31,7 @@ deployments:
     componentChart: true
     values:
       containers:
-      - image: dscr.io/${DEVSPACE_USERNAME}/devspace
+      - image: mydockeruser/devspace
       service:
         ports:
         - port: 80

examples/profiles/devspace.yaml

@@ -1,12 +1,12 @@
 version: v1beta5
 images:
   service-image-1:
-    image: dscr.io/${DEVSPACE_USERNAME}/service-1
+    image: mydockeruser/service-1
     dockerfile: service1/Dockerfile
     context: service1/
     createPullSecret: true
   service-image-2:
-    image: dscr.io/${DEVSPACE_USERNAME}/service-2
+    image: mydockeruser/service-2
     dockerfile: service2/Dockerfile
     context: service2/
     createPullSecret: true
@@ -16,13 +16,13 @@ deployments:
       componentChart: true
       values:
         containers:
-          - image: dscr.io/${DEVSPACE_USERNAME}/service-1
+          - image: mydockeruser/service-1
   - name: service-2
     helm:
       componentChart: true
       values:
         containers:
-          - image: dscr.io/${DEVSPACE_USERNAME}/service-2
+          - image: mydockeruser/service-2
 commands:
   - name: dev-service1
     command: "devspace dev --profile=dev-service1"

examples/quickstart-kubectl/devspace.yaml

@@ -1,7 +1,7 @@
-version: v1beta5
+version: v1beta9
 images:
   default:
-    image: dscr.io/yourusername/quickstart
+    image: mydockeruser/quickstart
 deployments:
 - name: devspace-default
   kubectl:

examples/quickstart-kubectl/kube/deployment.yaml

@@ -17,4 +17,4 @@ spec:
       containers:
         - name: default
           # The correct image tag will be inserted during devspace dev / devspace deploy
-          image: dscr.io/yourusername/quickstart
+          image: mydockeruser/quickstart

examples/redeploy-instead-of-hot-reload/devspace.yaml

@@ -1,4 +1,4 @@
-version: v1beta5
+version: v1beta9
 images:
   default:
     image: yourusername/devspace

pkg/devspace/dependency/resolver.go

@@ -230,9 +230,13 @@ func (r *resolver) resolveDependency(basePath string, dependency *latest.Depende
 			r.log.Donef("Pulled %s", ID)
 		}
 	} else if dependency.Source.Path != "" {
-		localPath, err = filepath.Abs(filepath.Join(basePath, filepath.FromSlash(dependency.Source.Path)))
-		if err != nil {
-			return nil, errors.Wrap(err, "filepath absolute")
+		if filepath.IsAbs(dependency.Source.Path) {
+			localPath = dependency.Source.Path
+		} else {
+			localPath, err = filepath.Abs(filepath.Join(basePath, filepath.FromSlash(dependency.Source.Path)))
+			if err != nil {
+				return nil, errors.Wrap(err, "filepath absolute")
+			}
 		}
 	}
 
@@ -362,7 +366,10 @@ func (r *resolver) getDependencyID(basePath string, dependency *latest.Dependenc
 		return id
 	} else if dependency.Source.Path != "" {
 		// Check if it's an git repo
-		filePath := filepath.Join(basePath, dependency.Source.Path)
+		filePath := dependency.Source.Path
+		if !filepath.IsAbs(dependency.Source.Path) {
+			filePath = filepath.Join(basePath, dependency.Source.Path)
+		}
 
 		remote, err := git.GetRemote(filePath)
 		if err == nil {

pkg/devspace/server/server.go

@@ -54,20 +54,24 @@ func NewServer(configLoader loader.ConfigLoader, config *latest.Config, generate
 	if forcePort != nil {
 		usePort = *forcePort
 
-		unused, err := port.CheckHostPort(host, usePort)
-		if unused == false {
-			return nil, errors.Errorf("Port %d already in use: %v", usePort, err)
-		}
-	} else {
-		for i := 0; i < 20; i++ {
+		if host == "localhost" {
 			unused, err := port.CheckHostPort(host, usePort)
-			if unused {
-				break
+			if unused == false {
+				return nil, errors.Errorf("Port %d already in use: %v", usePort, err)
 			}
-
-			usePort++
-			if i+1 == 20 {
-				return nil, err
+		}
+	} else {
+		if host == "localhost" {
+			for i := 0; i < 20; i++ {
+				unused, err := port.CheckHostPort(host, usePort)
+				if unused {
+					break
+				}
+
+				usePort++
+				if i+1 == 20 {
+					return nil, err
+				}
 			}
 		}
 	}
@@ -215,23 +219,6 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if strings.HasPrefix(r.URL.Path, "/api/") {
-		// check if we have a header or parameter
-		auth, ok := r.Header["Authorization"]
-		if !ok || len(auth) != 1 || auth[0] != h.token {
-			// check if there is a parameter (used for websockets)
-			token := r.URL.Query().Get("token")
-			if token != h.token {
-				w.WriteHeader(http.StatusUnauthorized)
-				// h.log.Infof("%s: unauthorized access from %s", r.URL.Path, r.RemoteAddr)
-				return
-			}
-		}
-	}
-
-	// if r.URL != nil {
-	//	h.log.Infof("Incoming request at %s", r.URL.String())
-	// }
 	h.mux.ServeHTTP(w, r)
 }
 

pkg/util/git/helper.go

@@ -4,12 +4,24 @@ import (
 	"github.com/pkg/errors"
 	"gopkg.in/src-d/go-git.v4"
 	"os"
+	"os/exec"
+	"strings"
 )
 
 // GetHash retrieves the current HEADs hash
 func GetHash(localPath string) (string, error) {
 	repo, err := git.PlainOpen(localPath)
 	if err != nil {
+		// last resort, try with cli
+		if isGitCommandAvailable() {
+			out, err := exec.Command("git", "rev-parse", "HEAD").CombinedOutput()
+			if err != nil {
+				return "", errors.Errorf("Error running 'git rev-parse HEAD': %v -> %s", err, string(out))
+			}
+
+			return strings.TrimSpace(string(out)), nil
+		}
+
 		return "", errors.Wrap(err, "git open")
 	}