Skip to content

Commit 0f608eb

Browse files
xcorailxcorail
authored
Merge branch 'main' into main
2 parents a77b2f4 + 8854b2a commit 0f608eb

30 files changed

+45
-42
lines changed

‎Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,7 @@ FROM gcr.io/distroless/base-debian12
2222
WORKDIR /server
2323
# Copy the binary from the build stage
2424
COPY --from=build /bin/github-mcp-server .
25-
# Command to run the server
26-
CMD ["./github-mcp-server", "stdio"]
25+
# Set the entrypoint to the server binary
26+
ENTRYPOINT ["/server/github-mcp-server"]
27+
# Default arguments for ENTRYPOINT
28+
CMD ["stdio"]

‎README.md‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,13 @@ docker run -i --rm \
220220
ghcr.io/github/github-mcp-server
221221
```
222222

223-
## GitHub Enterprise Server
223+
## GitHub Enterprise Server and Enterprise Cloud with data residency (ghe.com)
224224

225225
The flag `--gh-host` and the environment variable `GITHUB_HOST` can be used to set
226-
the GitHub Enterprise Server hostname.
227-
Prefix the hostname with the `https://` URI scheme, as it otherwise defaults to `http://` which GitHub Enterprise Server does not support.
226+
the hostname for GitHub Enterprise Server or GitHub Enterprise Cloud with data residency.
228227

228+
- For GitHub Enterprise Server, prefix the hostname with the `https://` URI scheme, as it otherwise defaults to `http://`, which GitHub Enterprise Server does not support.
229+
- For GitHub Enterprise Cloud with data residency, use `https://YOURSUBDOMAIN.ghe.com` as the hostname.
229230
``` json
230231
"github": {
231232
"command": "docker",
@@ -241,7 +242,7 @@ Prefix the hostname with the `https://` URI scheme, as it otherwise defaults to
241242
],
242243
"env": {
243244
"GITHUB_PERSONAL_ACCESS_TOKEN": "${input:github_token}",
244-
"GITHUB_HOST": "https://<your GHES domain name>"
245+
"GITHUB_HOST": "https://<your GHES or ghe.com domain name>"
245246
}
246247
}
247248
```

‎e2e/e2e_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/github/github-mcp-server/internal/ghmcp"
2020
"github.com/github/github-mcp-server/pkg/github"
2121
"github.com/github/github-mcp-server/pkg/translations"
22-
gogithub "github.com/google/go-github/v69/github"
22+
gogithub "github.com/google/go-github/v72/github"
2323
mcpClient "github.com/mark3labs/mcp-go/client"
2424
"github.com/mark3labs/mcp-go/mcp"
2525
"github.com/stretchr/testify/require"

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/github/github-mcp-server
33
go 1.23.7
44

55
require (
6-
github.com/google/go-github/v69 v69.2.0
6+
github.com/google/go-github/v72 v72.0.0
77
github.com/josephburnett/jd v1.9.2
8-
github.com/mark3labs/mcp-go v0.30.0
8+
github.com/mark3labs/mcp-go v0.31.0
99
github.com/migueleliasweb/go-github-mock v1.3.0
1010
github.com/sirupsen/logrus v1.9.3
1111
github.com/spf13/cobra v1.9.1

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlnd
1818
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
1919
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
2020
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
21-
github.com/google/go-github/v69 v69.2.0 h1:wR+Wi/fN2zdUx9YxSmYE0ktiX9IAR/BeePzeaUUbEHE=
22-
github.com/google/go-github/v69 v69.2.0/go.mod h1:xne4jymxLR6Uj9b7J7PyTpkMYstEMMwGZa0Aehh1azM=
2321
github.com/google/go-github/v71 v71.0.0 h1:Zi16OymGKZZMm8ZliffVVJ/Q9YZreDKONCr+WUd0Z30=
2422
github.com/google/go-github/v71 v71.0.0/go.mod h1:URZXObp2BLlMjwu0O8g4y6VBneUj2bCHgnI8FfgZ51M=
23+
github.com/google/go-github/v72 v72.0.0 h1:FcIO37BLoVPBO9igQQ6tStsv2asG4IPcYFi655PPvBM=
24+
github.com/google/go-github/v72 v72.0.0/go.mod h1:WWtw8GMRiL62mvIquf1kO3onRHeWWKmK01qdCY8c5fg=
2525
github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
2626
github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
2727
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -47,8 +47,8 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
4747
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
4848
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
4949
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
50-
github.com/mark3labs/mcp-go v0.30.0 h1:Taz7fiefkxY/l8jz1nA90V+WdM2eoMtlvwfWforVYbo=
51-
github.com/mark3labs/mcp-go v0.30.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
50+
github.com/mark3labs/mcp-go v0.31.0 h1:4UxSV8aM770OPmTvaVe/b1rA2oZAjBMhGBfUgOGut+4=
51+
github.com/mark3labs/mcp-go v0.31.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
5252
github.com/migueleliasweb/go-github-mock v1.3.0 h1:2sVP9JEMB2ubQw1IKto3/fzF51oFC6eVWOOFDgQoq88=
5353
github.com/migueleliasweb/go-github-mock v1.3.0/go.mod h1:ipQhV8fTcj/G6m7BKzin08GaJ/3B5/SonRAkgrk0zCY=
5454
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=

‎internal/ghmcp/server.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/github/github-mcp-server/pkg/github"
1616
mcplog "github.com/github/github-mcp-server/pkg/log"
1717
"github.com/github/github-mcp-server/pkg/translations"
18-
gogithub "github.com/google/go-github/v69/github"
18+
gogithub "github.com/google/go-github/v72/github"
1919
"github.com/mark3labs/mcp-go/mcp"
2020
"github.com/mark3labs/mcp-go/server"
2121
"github.com/shurcooL/githubv4"

‎pkg/github/code_scanning.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"net/http"
99

1010
"github.com/github/github-mcp-server/pkg/translations"
11-
"github.com/google/go-github/v69/github"
11+
"github.com/google/go-github/v72/github"
1212
"github.com/mark3labs/mcp-go/mcp"
1313
"github.com/mark3labs/mcp-go/server"
1414
)

‎pkg/github/code_scanning_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88

99
"github.com/github/github-mcp-server/pkg/translations"
10-
"github.com/google/go-github/v69/github"
10+
"github.com/google/go-github/v72/github"
1111
"github.com/migueleliasweb/go-github-mock/src/mock"
1212
"github.com/stretchr/testify/assert"
1313
"github.com/stretchr/testify/require"

‎pkg/github/context_tools_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/github/github-mcp-server/internal/toolsnaps"
1010
"github.com/github/github-mcp-server/pkg/translations"
11-
"github.com/google/go-github/v69/github"
11+
"github.com/google/go-github/v72/github"
1212
"github.com/migueleliasweb/go-github-mock/src/mock"
1313
"github.com/stretchr/testify/assert"
1414
"github.com/stretchr/testify/require"

‎pkg/github/issues.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/github/github-mcp-server/pkg/translations"
1313
"github.com/go-viper/mapstructure/v2"
14-
"github.com/google/go-github/v69/github"
14+
"github.com/google/go-github/v72/github"
1515
"github.com/mark3labs/mcp-go/mcp"
1616
"github.com/mark3labs/mcp-go/server"
1717
"github.com/shurcooL/githubv4"
@@ -451,11 +451,11 @@ func ListIssues(getClient GetClientFn, t translations.TranslationHelperFunc) (to
451451
}
452452

453453
if page, ok := request.GetArguments()["page"].(float64); ok {
454-
opts.Page = int(page)
454+
opts.ListOptions.Page = int(page)
455455
}
456456

457457
if perPage, ok := request.GetArguments()["perPage"].(float64); ok {
458-
opts.PerPage = int(perPage)
458+
opts.ListOptions.PerPage = int(perPage)
459459
}
460460

461461
client, err := getClient(ctx)

0 commit comments

Comments
 (0)