Skip to content

Commit b191374

Browse files
authored
Merge pull request #2025 from jschalz/v6-docs-dev
[WIP] v6 Docs Dev (jschalz)
2 parents 3edf709 + cd6454e commit b191374

31 files changed

Lines changed: 238 additions & 192 deletions

docs/pages/_partials/command_is_command.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@ The function `is_command` checks if a given argument is a command in DevSpace.
22

33
## Arguments
44

5-
### `[command]`
5+
### `[DevSpace command]`
66

77
```
88
is_command [command]
99
```
1010

1111
### Example
1212

13-
TODO: Fix example
14-
1513
```yaml
1614
pipelines:
1715
dev:
1816
run: |-
19-
is_command
17+
if is_command dev; then
18+
start_dev --all
19+
fi
2020
```

docs/pages/_partials/command_is_os.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ is_os [os]
1010

1111
### Example
1212

13-
TODO: Fix example
14-
1513
```yaml
1614
pipelines:
1715
dev:
1816
run: |-
19-
is_os
17+
if is_os windows; then
18+
echo "Running on Windows!"
19+
fi
2020
```
Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
TODO: run_watch one-liner description
1+
The function `run_watch` takes in a path to watch and a subcommand to run on that path.
22

33
## Arguments
44

55
### `--fail-on-error`
66

7-
If true, the command will fail on an error while running the sub command.
7+
If true, the command will fail on an error while running the subcommand.
88

99
```
10-
run_watch --path MY_PATH -- my_command
10+
run_watch --path [MY_PATH] -- [my_command]
1111
```
1212

1313
### `--path`, `-p`
@@ -19,11 +19,9 @@ The paths to watch. Can be patterns in the form of `./**/my-file.txt`.
1919

2020
### Example
2121

22-
TODO: Fix example
23-
2422
```yaml
25-
pipelines:
26-
dev:
27-
run: |-
28-
run_watch
23+
commands:
24+
# Overwrites dev
25+
dev: |-
26+
run_watch -p devspace.yaml -p *.go -- devspace run-pipeline dev $@
2927
```
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
//TODO: Lukas/Fabian, what does this function look like in action?
2-
31
The function `xargs` allows a user to overwrite current flags and utilities.
42

53
## Usage
@@ -12,11 +10,9 @@ xargs [utility [argument ...]]
1210

1311
### Example
1412

15-
TODO: Fix example
16-
1713
```yaml
1814
pipelines:
1915
dev:
2016
run: |-
21-
xargs
17+
echo [image1] [image2] | xargs build_images
2218
```

docs/pages/configuration/dependencies/basics.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Dependencies for DevSpace projects are defined within the `dependencies` section
2525

2626
```yaml
2727
dependencies:
28-
- name: api-server
28+
- name: api-server
2929
source:
3030
git: https://github.com/my-api-server
3131
branch: stable
@@ -114,7 +114,7 @@ dependencies:
114114
source:
115115
path: dep1
116116
dev:
117-
# Will open a terminal to the pod with the
117+
# Will open a terminal to the pod with the
118118
# image from dep1
119119
terminal:
120120
imageSelector: ${runtime.dependencies.dep1.images.image1}
@@ -136,7 +136,7 @@ deployments:
136136

137137
### Referencing Dependencies in Deployment Values / Manifests
138138

139-
It is also possible to reference a dependency's image with [runtime variables](../variables/runtime-variables.mdx) in a deployment:
139+
It is also possible to reference a dependency's image with [runtime variables](../variables/built-in.mdx) in a deployment:
140140
```yaml
141141
dependencies:
142142
- name: dep1
@@ -148,7 +148,7 @@ deployments:
148148
componentChart: true
149149
values:
150150
containers:
151-
- image: ${runtime.dependencies.dep1.image1.image}:${runtime.dependencies.dep1.image1.tag} # -> replaced with 'myusername/devspace:xxxx'
151+
- image: ${runtime.dependencies.dep1.image1.image}:${runtime.dependencies.dep1.image1.tag} # -> replaced with 'myusername/devspace:xxxx'
152152
```
153153

154154
With a dependency `dep1/devspace.yaml` that looks like:

docs/pages/configuration/deployments/helm/basics.mdx

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ deployments:
4747
name: chart-name
4848
repo: https://my-charts.company.tld/
4949
values:
50-
# If registry.url/repo/image was found under images as well, will be
50+
# If registry.url/repo/image was found under images as well, will be
5151
# rewritten to registry.url/repo/image:generated_tag
5252
imageWithTag: registry.url/repo/image
5353
# If registry.url/repo/image was found under images.app as well, will be
@@ -135,7 +135,7 @@ deployments:
135135
```
136136

137137
### `updateImageTags`
138-
The `updateImageTags` option expects a boolean stating if DevSpace should do [Image Tag Replacement](../../configuration/deployments/basics.mdx#3-tag-replacement).
138+
The `updateImageTags` option expects a boolean stating if DevSpace should do [Image Tag Replacement](../basics.mdx#3-tag-replacement).
139139

140140
When set to `true`, DevSpace searches all your values (specified via `values` or `valuesFiles`) for images that are defined in the `images` section of the `devspace.yaml`. If DevSpace finds an image, it replaces or appends the image tag with the tag it created during the image building process. Image tag replacement makes sure that your application will always be started with the most up-to-date image that DevSpace has built for you.
141141

@@ -201,8 +201,8 @@ deployments:
201201
chart:
202202
name: bitnami/mysql
203203
```
204-
**Explanation:**
205-
Deploying the above example would roughly be equivalent to this command:
204+
**Explanation:**
205+
Deploying the above example is roughly equivalent to this command:
206206
```bash
207207
helm install database bitnami/mysql
208208
```
@@ -228,8 +228,8 @@ deployments:
228228
name: bitnami/mysql
229229
version: "1.3.1"
230230
```
231-
**Explanation:**
232-
Deploying the above example would roughly be equivalent to this command:
231+
**Explanation:**
232+
Deploying the above example is roughly equivalent to this command:
233233
```bash
234234
helm install database bitnami/mysql --version="1.3.1"
235235
```
@@ -246,8 +246,8 @@ deployments:
246246
name: custom-chart
247247
repo: https://my-repo.tld/
248248
```
249-
**Explanation:**
250-
Deploying the above example would roughly be equivalent to this command:
249+
**Explanation:**
250+
Deploying the above example is roughly equivalent to this command:
251251
```bash
252252
helm install database custom-chart --repo "https://my-repo.tld/"
253253
```
@@ -266,7 +266,7 @@ The `values` option expects an object with values that should be overriding the
266266

267267
Compared to the `valuesFiles` option, using `values` has the following advantages:
268268
- It is easier to comprehend and faster to find (no references)
269-
- It allows you to use [dynamic config variables](../../configuration/variables/basics.mdx)
269+
- It allows you to use [dynamic config variables](../../variables/basics.mdx)
270270

271271
:::info
272272
Because both, `values` and `valuesFiles`, have advantages and disadvantages, it is often useful to combine them. When setting both, values defined in `values` have precedence over values defined in `valuesFiles`.
@@ -289,8 +289,8 @@ deployments:
289289
mysqlUser: db_user
290290
mysqlDatabase: app_database
291291
```
292-
**Explanation:**
293-
Deploying the above example would roughly be equivalent to this command:
292+
**Explanation:**
293+
Deploying the above example is roughly equivalent to this command:
294294
```bash
295295
helm install database bitnami/mysql --set mysqlRootPassword="$MYSQL_ROOT_PASSWORD" --set mysqlUser="db_user" --set mysqlDatabase="app_database"
296296
```
@@ -322,8 +322,8 @@ deployments:
322322
- mysql/values.yaml
323323
- mysql/values.production.yaml
324324
```
325-
**Explanation:**
326-
Deploying the above example would roughly be equivalent to this command:
325+
**Explanation:**
326+
Deploying the above example is roughly equivalent to this command:
327327
```bash
328328
helm install database bitnami/mysql -f mysql/values.yaml -f mysql/values.production.yaml
329329
```
@@ -349,8 +349,8 @@ deployments:
349349
name: bitnami/mysql
350350
```
351351

352-
**Explanation:**
353-
Deploying the above example would print the helm output and the `notes.txt` from the bitnami/mysql chart.
352+
**Explanation:**
353+
Deploying the above example prints the helm output and the `notes.txt` from the bitnami/mysql chart.
354354

355355
### `templateArgs`
356356
The `templateArgs` specifies an array of arguments that will be passed by devspace additionally to the standard arguments to `helm template` during `devspace render`.

docs/pages/configuration/dev/basics.mdx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Kubernetes-based development can be useful in the following cases:
1919
- You want to test your application in a production-like environment
2020
- You want to debug issues that are hard to reproduce on your local machine
2121

22-
The development experience is very similar to using `docker-compose`, so if you are already familiar on how to develop with `docker-compose`, DevSpace will behave very similar. One of the major benefits of DevSpace versus docker-compose is that DevSpace allows you to develop in any Kubernetes cluster, either locally using minikube, Docker Kubernetes etc. or in any remote Kubernetes cluster.
22+
The development experience is very similar to using `docker-compose`. If you are already familiar with how to develop with `docker-compose`, DevSpace will behave very similar. One of the benefits of DevSpace versus `docker-compose` is that DevSpace allows you to develop in any Kubernetes cluster, either locally using minikube, Docker Kubernetes etc., or in any remote Kubernetes cluster.
2323

2424

2525
## Start Development Mode
@@ -93,7 +93,7 @@ DevSpace provides two options to develop applications in Kubernetes:
9393
:::note Multi-Container Log Streaming (default)
9494
The first option starts your application as defined in your Dockerfile or in your Kubernetes pod definition. After the pods are started, DevSpace streams the logs of all containers that are started with an image that was built during the image building process. Each log line is prefixed with the image name or alternatively with the pod name of the container. Before starting the actual log streaming, DevSpace prints the last 50 log lines of each container by default.
9595

96-
Learn how to [customize which containers should be included in the log stream and how many log lines should be shown in the beginning](../../configuration/development/log-streaming.mdx).
96+
Learn how to [customize which containers should be included in the log stream and how many log lines should be shown in the beginning](../../configuration/dev/workflow/log-streaming.mdx).
9797
:::
9898

9999
:::note Terminal Session
@@ -103,15 +103,15 @@ devspace dev -t
103103
```
104104
Instead of starting the multi-container log streaming, you can also start development mode using a terminal session.
105105

106-
Terminal is configurable by [using the `dev.terminal` configuration section](../../configuration/development/terminal.mdx).
106+
Terminal is configurable by [using the `dev.terminal` configuration section](../../configuration/dev/workflow/terminal.mdx).
107107
:::
108108

109109
### 8. Open Links (optional)
110110
DevSpace iterates over every item in the `dev.open` array defined in the `devspace.yaml` and tries to open the URL you provide for each item using the following method:
111111

112112
<FragmentWorkflowOpenLinks/>
113113

114-
Learn more about [configuring auto-opening links](../../configuration/development/open-links.mdx).
114+
Learn more about [configuring auto-opening links](../../configuration/dev/workflow/open.mdx).
115115

116116

117117

0 commit comments

Comments
 (0)