Skip to content

Commit 1de0eea

Browse files
committed
- Update docker version in devbox dependencies.
- Fix error when starting devbox shell due to missing local config file.
1 parent b5247ae commit 1de0eea

File tree

3 files changed

+18
-14
lines changed

3 files changed

+18
-14
lines changed

deployment/prod-deploy.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ load_config() {
2828
local config="$(yq -n 'load("./deployment/prod-config.yaml")')"
2929

3030
elif [ "$environment" = "dev" ]; then
31-
local config="$(yq -n 'load("./deployment/prod-config.yaml") * load("./deployment/dev-config.yaml") * load("./deployment/local-config.yaml")')"
31+
if [ -f "./deployment/local-config.yaml" ]; then
32+
local config="$(yq -n 'load("./deployment/prod-config.yaml") * load("./deployment/dev-config.yaml") * load("./deployment/local-config.yaml")')"
33+
else
34+
local config="$(yq -n 'load("./deployment/prod-config.yaml") * load("./deployment/dev-config.yaml")')"
35+
fi
3236
else
3337
echo "incorrect value for argument. Pass in either 'prod' or 'dev'."
3438
exit 1

devbox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/jetify-com/devbox/0.13.7/.schema/devbox.schema.json",
33
"packages": [
4-
"docker@27.3.1",
4+
"docker@27.4.1",
55
66
"kubectl@latest",
77

devbox.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,51 +65,51 @@
6565
}
6666
}
6767
},
68-
"docker@27.3.1": {
69-
"last_modified": "2024-11-28T07:51:56Z",
70-
"resolved": "github:NixOS/nixpkgs/226216574ada4c3ecefcbbec41f39ce4655f78ef#docker",
68+
"docker@27.4.1": {
69+
"last_modified": "2025-01-09T11:09:19Z",
70+
"resolved": "github:NixOS/nixpkgs/32af3611f6f05655ca166a0b1f47b57c762b5192#docker",
7171
"source": "devbox-search",
72-
"version": "27.3.1",
72+
"version": "27.4.1",
7373
"systems": {
7474
"aarch64-darwin": {
7575
"outputs": [
7676
{
7777
"name": "out",
78-
"path": "/nix/store/v69vm56w9v74ncyz5lccvmb8cvpsmq6p-docker-27.3.1",
78+
"path": "/nix/store/4j3f6xqn2wi3590fw54hj9pcwz58dcbd-docker-27.4.1",
7979
"default": true
8080
}
8181
],
82-
"store_path": "/nix/store/v69vm56w9v74ncyz5lccvmb8cvpsmq6p-docker-27.3.1"
82+
"store_path": "/nix/store/4j3f6xqn2wi3590fw54hj9pcwz58dcbd-docker-27.4.1"
8383
},
8484
"aarch64-linux": {
8585
"outputs": [
8686
{
8787
"name": "out",
88-
"path": "/nix/store/zhr2pv6124qvwn53fzy8048y002k982l-docker-27.3.1",
88+
"path": "/nix/store/jx6sk7ps4mjickj40z75d13qr8hrhpn2-docker-27.4.1",
8989
"default": true
9090
}
9191
],
92-
"store_path": "/nix/store/zhr2pv6124qvwn53fzy8048y002k982l-docker-27.3.1"
92+
"store_path": "/nix/store/jx6sk7ps4mjickj40z75d13qr8hrhpn2-docker-27.4.1"
9393
},
9494
"x86_64-darwin": {
9595
"outputs": [
9696
{
9797
"name": "out",
98-
"path": "/nix/store/gw7f9j1qabxasvhr5vr10a3knlpjhbam-docker-27.3.1",
98+
"path": "/nix/store/rflmb941mrih44am3girmnadq04vqghv-docker-27.4.1",
9999
"default": true
100100
}
101101
],
102-
"store_path": "/nix/store/gw7f9j1qabxasvhr5vr10a3knlpjhbam-docker-27.3.1"
102+
"store_path": "/nix/store/rflmb941mrih44am3girmnadq04vqghv-docker-27.4.1"
103103
},
104104
"x86_64-linux": {
105105
"outputs": [
106106
{
107107
"name": "out",
108-
"path": "/nix/store/26v8l3ss57afic9w3h33igm6bwnggyyc-docker-27.3.1",
108+
"path": "/nix/store/x4lbbzm4x5w0f55dhfdr62b18a4hzz8f-docker-27.4.1",
109109
"default": true
110110
}
111111
],
112-
"store_path": "/nix/store/26v8l3ss57afic9w3h33igm6bwnggyyc-docker-27.3.1"
112+
"store_path": "/nix/store/x4lbbzm4x5w0f55dhfdr62b18a4hzz8f-docker-27.4.1"
113113
}
114114
}
115115
},

0 commit comments

Comments
 (0)