Skip to content

Commit f7aa2d3

Browse files
author
Florian
committed
Merge branch 'master' of github.com:covexo/devspace into fix-red-text-by-log-fatal
2 parents c8caef7 + 00a7085 commit f7aa2d3

58 files changed

Lines changed: 2308 additions & 575 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
/.devspace/
77
/chart/
88
/Dockerfile
9+
/.dockerignore
910

1011
# Build files
1112
*.exe
@@ -14,4 +15,6 @@
1415
# History Plugin for VS Code
1516
.history/
1617

18+
/devspace
1719
debug
20+
.DS_STORE

.vscode/launch.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"remotePath": "",
1010
"port": 2345,
1111
"host": "127.0.0.1",
12-
"cwd": "${workspaceFolder}/examples/nodejs",
12+
"cwd": "${workspaceFolder}",
1313
"program": "${workspaceFolder}/main.go",
1414
"env": {},
15-
"args": [""],
15+
"args": ["list", "package"],
1616
"showLog": true
1717
}
1818
]

Gopkg.lock

Lines changed: 32 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
[[constraint]]
6363
name = "k8s.io/helm"
64-
version = "v2.9.1"
64+
version = "v2.10.0"
6565

6666
[[constraint]]
6767
name = "github.com/foomo/htpasswd"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ devspace up
5555
```
5656
Take a look at the [Getting Started Guide](https://devspace.covexo.com/docs/getting-started/quickstart.html) on our documentation page to see how to get started with a DevSpace.
5757

58-
**Note:** Don't worry, with you can use `devspace reset` to reset your project and go back to local development.
58+
**Note:** Don't worry, you can use `devspace reset` to reset your project and go back to local development.
5959

6060
## [Documentation](https://devspace.covexo.com/docs/getting-started/quickstart.html)
6161
Here you can find some links to the most important pages of our documentation:

0 commit comments

Comments
 (0)