Skip to content

Commit d687a16

Browse files
Fix host-binary Policies
1 parent 0f77d32 commit d687a16

File tree

7 files changed

+116
-12
lines changed

7 files changed

+116
-12
lines changed

src/docker.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
(format "%s ; %s"
288288
(->> secrets
289289
(map (fn [[k v]]
290-
(format "%s=$(cat /secret/%s | sed -e \"s/^[[:space:]]*//\")" v (name k))))
290+
(format "export %s=$(cat /secret/%s | sed -e \"s/^[[:space:]]*//\")" v (name k))))
291291
(string/join " ; "))
292292
s))
293293

@@ -298,7 +298,7 @@
298298
(-> (images {"reference" [(:image container-definition)]})
299299
first))
300300
:Config)
301-
real-entrypoint (string/join " " (concat Entrypoint (or (:command container-definition) :Cmd)))]
301+
real-entrypoint (string/join " " (concat Entrypoint (or (:command container-definition) Cmd)))]
302302
(-> container-definition
303303
(assoc :entrypoint ["/bin/sh" "-c" (injected-entrypoint (:secrets container-definition) real-entrypoint)])
304304
(dissoc :command))))

src/extension/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
mcp_docker:
3-
image: mcp/docker:0.0.1
3+
image: mcp/docker:0.0.2
44
ports:
55
- 8811:8811
66
volumes:

src/extension/flake.lock

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

src/extension/flake.nix

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
description = "Go development environment";
3+
4+
inputs = {
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
6+
flake-utils.url = "github:numtide/flake-utils";
7+
};
8+
9+
outputs = { self, nixpkgs, flake-utils }:
10+
flake-utils.lib.eachDefaultSystem (system:
11+
let
12+
pkgs = nixpkgs.legacyPackages.${system};
13+
in
14+
{
15+
devShells.default = pkgs.mkShell {
16+
buildInputs = with pkgs; [
17+
# Go compiler and tools
18+
go
19+
gopls # Go language server
20+
go-tools # Additional Go tools
21+
delve # Go debugger
22+
golangci-lint # Linter
23+
];
24+
25+
shellHook = ''
26+
echo "🚀 Welcome to Go development environment!"
27+
echo "Available tools:"
28+
echo " - go (compiler)"
29+
echo " - gopls (language server)"
30+
echo " - golangci-lint (linter)"
31+
echo " - delve (debugger)"
32+
'';
33+
};
34+
});
35+
}

src/extension/host-binary/pkg/client/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ func NewApiClient(socketPath string) ApiClient {
3939
type Secret struct {
4040
Name string
4141
Value string
42+
Policies []string
4243
}
4344

4445
func (d apiClientImpl) SetSecret(ctx context.Context, s secretsapi.Secret) error {
4546
apiReq := d.SecretsApi.SetJfsSecret(ctx)
46-
req := secretsapi.NewSecret(s.Name, s.Value)
47+
req := secretsapi.NewSecret(s.Name, s.Value, s.Policies)
4748
_, err := apiReq.Secret(*req).Execute()
4849
return err
4950
}

src/extension/host-binary/pkg/generated/go/client/secrets/model_secret.go

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

src/mcp/client.clj

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,14 @@
125125
identity))
126126

127127
(comment
128+
(docker/run-container
129+
{:image "vonwig/stripe:latest"
130+
:secrets {:stripe.api_key "API_KEY"}
131+
:entrypoint ["/bin/sh" "-c" "cat /secret/stripe.api_key"]})
132+
(docker/run-container
133+
{:image "vonwig/stripe:latest"
134+
:secrets {:stripe.api_key "API_KEY"}
135+
:entrypoint ["/bin/sh" "-c" "cat /secret/stripe.api_key"]})
128136
(async/<!!
129137
(call-tool
130138
{:image "vonwig/stripe:latest"
@@ -157,18 +165,16 @@
157165

158166
(comment
159167
(get-mcp-tools-from-prompt [{:container {:image "mcp/stripe:latest"
168+
:secrets {:stripe.api_key "API_KEY"}
160169
:command ["--tools=all"
161-
"--api-key=sk_asd"]}}])
162-
(get-mcp-tools-from-prompt [{:container {:image "mcp/stripe:latest"
163-
:command ["--tools=all"
164-
"--api-key={{ stripe.api_key }}"]}}])
170+
"--api-key=$API_KEY"]}}])
165171
(get-mcp-tools-from-prompt [{:container {:image "mcp/brave-search:latest"
166172
:workdir "/app"
167-
:environment {"BRAVE_API_KEY" "{{ brave.api_key }}"}}}])
173+
:secrets {:brave.api_key "BRAVE_API_KEY"} }}])
168174
(get-mcp-tools-from-prompt [{:container {:image "mcp/slack:latest"
169175
:workdir "/app"
170-
:environment {"SLACK_BOT_TOKEN" "{{ slack.bot_token }}"
171-
"SLACK_TEAM_ID" "{{ slack.team_id }}"}}}])
176+
:secrets {:slack.bot_token "SLACK_BOT_TOKEN"
177+
:slack.team_id "SLACK_TEAM_ID"}}}])
172178
(get-mcp-tools-from-prompt [{:container {:image "mcp/redis:latest"}}]))
173179

174180
(comment

0 commit comments

Comments
 (0)