Merge pull request #1970 from FabianKramm/master

fix: small fixes & examples update

Author: FabianKramm

examples/buildkit-in-cluster/devspace.yaml

@@ -1,29 +1,34 @@
-version: v1beta11
+version: v2beta1
+name: buildkit-in-cluster
+
+# Define an image to use
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
+# Build the dockerfile with buildkit
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    build:
-      buildKit:
+    buildKit:
         inCluster: {}
+
+# Deploy the built image with helm and the component chart
 deployments:
-  - name: quickstart
+  my-deployment:
+    updateImageTags: true
     helm:
-      componentChart: true
       values:
         containers:
           - image: ${IMAGE}
-        service:
-          ports:
-            - port: 3000
+
+# Is started after images were built and deployments deployed
 dev:
-  ports:
-    - imageSelector: ${IMAGE}
-      forward:
-        - port: 3000
-  sync:
-    - imageSelector: ${IMAGE}
-      excludePaths:
-        - node_modules
+  my-dev:
+    imageSelector: ${IMAGE}
+    logs: {}
+    ports:
+      - port: 3000
+    sync:
+      - path: ./
+        excludePaths:
+          - node_modules

examples/buildkit/devspace.yaml

@@ -1,28 +1,33 @@
-version: v1beta11
+version: v2beta1
+name: buildkit
+
+# Define an image to use
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
+# Build the dockerfile with buildkit
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    build:
-      buildKit: {}
+    buildKit: {}
+
+# Deploy the built image with helm and the component chart
 deployments:
-  - name: quickstart
+  my-deployment:
+    updateImageTags: true
     helm:
-      componentChart: true
       values:
         containers:
           - image: ${IMAGE}
-        service:
-          ports:
-            - port: 3000
+
+# Is started after images were built and deployments deployed
 dev:
-  ports:
-    - imageSelector: ${IMAGE}
-      forward:
-        - port: 3000
-  sync:
-    - imageSelector: ${IMAGE}
+  my-dev:
+    imageSelector: ${IMAGE}
+    logs: {}
+    ports:
+    - port: 3000
+    sync:
+    - path: ./
       excludePaths:
-        - node_modules
+        - node_modules

examples/custom-builder/devspace.yaml

@@ -1,29 +1,36 @@
 # Note: This example only works in minikube, since the custom builder
 # does not push the image
-version: v1beta11
+version: v2beta1
+name: custom-builder
+
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    build:
-      custom:
-        skipImageArg: true
-        command: |-
-          # Also works on windows as this is executed in a golang shell
-          docker build -t ${runtime.images.default.image}:${runtime.images.default.tag} . -f custom/Dockerfile
-        onChange:
-        - main.go
+    custom:
+      command: |-
+        # Also works on windows as this is executed in a pseudo shell
+        docker build -t ${runtime.images.my-image.image}:${runtime.images.my-image.tag} . -f custom/Dockerfile
+      onChange:
+      - main.go
+
 deployments:
-- name: devspace-default
-  kubectl:
-    manifests:
-    - kube
+  my-deployment:
+    updateImageTags: true
+    kubectl:
+      manifests:
+      - kube
+
 dev:
-  ports:
-  - imageSelector: ${IMAGE}
-    forward:
+  my-dev:
+    imageSelector: ${IMAGE}
+    logs: {}
+    command: ["go", "run", "main.go"]
+    ports:
     - port: 8080
-  sync:
-  - imageSelector: ${IMAGE}
+    sync:
+    - path: ./
+      onUpload:
+        restartContainer: true

examples/dependencies/dependency1/devspace.yaml

@@ -12,6 +12,3 @@ deployments:
     values:
       containers:
       - image: ${IMAGE}
-hooks:
-  - command: "echo 'Hello from dependency1'"
-    events: ["before:build:*"]

examples/dependencies/devspace.yaml

@@ -1,19 +1,16 @@
-version: v1beta11
+version: v2beta1
+
 dependencies:
-- name: dependency1
-  source:
+  dependency1:
     path: dependency1
-- name: dependency2
-  source:
+  dependency2:
     path: dependency2
-  # Use dev.ports config from dependency2
-  dev:
-    ports: true
-- name: dependency3
-  source:
+    pipeline: dev      # Allow ports etc from dependency2
+  dependency3:
     git: https://github.com/devspace-cloud/example-dependency.git
+
 dev:
-  # Open terminal to the pod with the imageName created in dependency1
-  terminal:
-    imageSelector: image(dependency1.default)
+  my-dev:
+    imageSelector: ${runtime.dependencies.dependency1.images.default}
+    terminal: {}
 

examples/hooks/Dockerfile

@@ -1,39 +1,29 @@
-version: v1beta11
+version: v2beta1
+name: hot-reload-container-restart
+
 vars:
-  - name: IMAGE
-    value: myusername/devspace
+  IMAGE: myusername/devspace
+
 images:
-  default:
+  my-image:
     image: ${IMAGE}
-    # this option tells devspace to automatically wrap the Dockerfile entrypoint in memory
-    # with a small restart helper script so that the process can be easily restarted from within the
-    # container. This should work with most Dockerfiles that have an ENTRYPOINT statement.
-    # This will also work for build targets.
-    # Note: If you override the entrypoint in the kubernetes yaml via the Pod.spec.containers.command,
-    # please make sure you wrap the command with the devspace script '/devspace-restart-helper'
-    injectRestartHelper: true
-    # If you don't have an entrypoint defined in your Dockerfile, you can also define an entrypoint here
-    # entrypoint: ["go"]
-    # cmd: ["run", "main.go"]
+
 deployments:
-- name: quickstart
-  helm:
-    componentChart: true
-    values:
-      containers:
-      - image: ${IMAGE}
-      service:
-        ports:
-        - port: 8080
+  my-deployment:
+    updateImageTags: true
+    helm:
+      values:
+        containers:
+        - image: ${IMAGE}
+
 dev:
-  ports:
-  - imageSelector: ${IMAGE}
-    forward:
+  my-dev:
+    imageSelector: ${IMAGE}
+    command: ["go", "run", "main.go"] # Needed so that DevSpace knows which command to restart
+    logs: {}
+    ports:
     - port: 8080
-  sync:
-  - imageSelector: ${IMAGE}
-    onUpload:
-      # this option tells devspace to restart the container process if something changes within
-      # the container. This obviously only works if the restart helper script is present in the container.
-      # You can either manually add the restart script or add the injectRestartHelper option to the image
-      restartContainer: true
+    sync:
+    - path: ./
+      onUpload:
+        restartContainer: true