Skip to content

Commit 3df27b9

Browse files
committed
Merge 0.13.6 into latest
1 parent aab705d commit 3df27b9

File tree

25 files changed

+651
-96
lines changed

25 files changed

+651
-96
lines changed

.github/workflows/debug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
default: "ubuntu-latest"
1010
type: choice
1111
options:
12-
- macos-12
12+
- macos-latest
1313
- ubuntu-latest
1414

1515
permissions:

docs/app/docs/cli_reference/devbox_completion_zsh.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@
22

33
Generate the autocompletion script for the zsh shell.
44

5-
If shell completion is not already enabled in your environment you will need
6-
to enable it. You can execute the following once:
5+
If you are using Oh My Zsh, just run the following:
6+
7+
```bash
8+
mkdir -p ~/.oh-my-zsh/completions
9+
devbox completion zsh > ~/.oh-my-zsh/completions/_devbox
10+
```
11+
12+
If you are not using Oh My Zsh and shell completion is not already enabled in your environment you will need
13+
to enable it. You can execute the following once:
714

815
```bash
916
echo "autoload -U compinit; compinit" >> ~/.zshrc

docs/app/docs/configuration.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ Currently, you can only set values using string literals, `$PWD`, and `$PATH`. A
182182

183183
### Env From
184184

185-
Env from takes a string or list of strings for loading environment variables into your shells and scripts. Currently it supports loading from two sources: .env files, and Jetify Secrsts.
185+
Env from takes a string for loading environment variables into your shells and scripts. Currently it supports loading from two sources: .env files, and Jetify Secrets.
186186

187187
#### .env Files
188188

189-
You can load environment variables from a `.env` file by adding the path to the file in the `env_from` field. This is useful for loading secrets or other sensitive information that you don't want to store in your `devbox.json`.
189+
You can load environment variables from a `.env` file by adding the path to the file in the `env_from` field (the file must end with `.env`). This is useful for loading secrets or other sensitive information that you don't want to store in your `devbox.json`.
190190

191191
```json
192192
{
@@ -198,15 +198,15 @@ This will load the environment variables from the `.env` file into your shell wh
198198

199199
#### Jetify Secrets
200200

201-
You can securely load secrets from Jetify Secrets by running `devbox secrets init` and creating a project in Jetify Cloud. This will add the `jetpack-cloud` field to `env_from` in your project.
201+
You can securely load secrets from Jetify Secrets by running `devbox secrets init` and creating a project in Jetify Cloud. This will add the `jetify-cloud` field to `env_from` in your project.
202202

203203
```json
204204
{
205-
"env_from": "jetpack-cloud"
205+
"env_from": "jetify-cloud"
206206
}
207207
```
208208

209-
Note that setting secrets securetly with Jetify Secrets requires a Jetify Cloud account. For more information, see the [Jetify Secrets](/docs/cloud/secrets/) guide.
209+
Note that setting secrets securely with Jetify Secrets requires a Jetify Cloud account. For more information, see the [Jetify Secrets](/docs/cloud/secrets/) guide.
210210

211211
### Shell
212212

docs/app/docs/guides/creating_plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ The plugin.json below installs MongoDB + the Mongo shell, and sets the environme
219219
"version": "0.0.1",
220220
"description": "Plugin for the [`mongodb`](https://www.nixhub.io/packages/mongodb) package. This plugin configures MonogoDB to use a local config file and data directory for this project, and configures a mongodb service.",
221221
"packages": [
222-
"mongodb@latest"
222+
"mongodb@latest",
223223
"mongosh@latest"
224224
],
225225
"env": {

docs/app/docs/guides/secrets.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ For environment variables that you want to keep out of your `devbox.json` file,
2828
{
2929
"packages": {},
3030
"shell": {},
31-
"env_from": [
32-
"path/to/.env"
33-
]
31+
"env_from": "path/to/.env"
3432
}
3533
```
3634

docs/app/docs/quickstart.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Follow the instruction from [the installation guide](./installing_devbox.mdx).
2121
:::note
2222
If you want to try Devbox before installing it, you can open a cloud shell on your browser using the link below
2323

24-
[![Open In Devspace](https://www.jetify.com/img/devbox/open-in-devbox.svg)](https://www.jetify.com/devbox/templates/tutorial)
24+
[![Open In Devspace](https://www.jetify.com/img/devbox/open-in-devspace.svg)](https://www.jetify.com/devbox/templates/tutorial)
2525
:::
2626

2727
## Create a Development Environment

docs/app/docusaurus.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const config = {
6666
routeBasePath: "cloud",
6767
sidebarPath: require.resolve("./cloud_sidebars.js"),
6868
},
69-
],[
69+
], [
7070
"@docusaurus/plugin-content-docs",
7171
{
7272
id: "nixhub",

flake.lock

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

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
let
1212
pkgs = nixpkgs.legacyPackages.${system};
1313

14-
lastTag = "0.13.5";
14+
lastTag = "0.13.6";
1515

1616
revision =
1717
if (self ? shortRev)

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ require (
4242
github.com/zealic/go2node v0.1.0
4343
go.jetify.com/typeid v1.2.0
4444
go.jetpack.io/envsec v0.0.16-0.20240604163020-540ad12af899
45-
go.jetpack.io/pkg v0.0.0-20240815004735-7649b4283d51
45+
go.jetpack.io/pkg v0.0.0-20241025195518-152e59e26d5d
4646
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8
4747
golang.org/x/mod v0.18.0
4848
golang.org/x/oauth2 v0.21.0

0 commit comments

Comments
 (0)