Resolve merge conflict in README.md by merging Docker and token permission instructions

Author: aryasoni98

.dockerignore

@@ -0,0 +1,11 @@
+.github
+.vscode
+script
+third-party
+.dockerignore
+.gitignore
+**/*.yml
+**/*.yaml
+**/*.md
+**/*_test.go
+LICENSE

.github/CODEOWNERS

@@ -1 +1 @@
-* @juruen @sammorrowdrums @williammartin @toby
+* @github/github-mcp-server

.github/workflows/lint.yaml

@@ -24,7 +24,7 @@ jobs:
           go mod verify
           go mod download
 
-          LINT_VERSION=1.64.8
+          LINT_VERSION=2.1.6
           curl -fsSL https://github.com/golangci/golangci-lint/releases/download/v${LINT_VERSION}/golangci-lint-${LINT_VERSION}-linux-amd64.tar.gz | \
             tar xz --strip-components 1 --wildcards \*/golangci-lint
           mkdir -p bin && mv golangci-lint bin/
@@ -45,6 +45,6 @@ jobs:
           assert-nothing-changed go fmt ./...
           assert-nothing-changed go mod tidy
 
-          bin/golangci-lint run --out-format=colored-line-number --timeout=3m || STATUS=$?
+          bin/golangci-lint run --timeout=3m || STATUS=$?
 
           exit $STATUS

.gitignore

@@ -1,5 +1,13 @@
 .idea
 cmd/github-mcp-server/github-mcp-server
+
+# VSCode
+.vscode/*
+!.vscode/launch.json
+
 # Added by goreleaser init:
 dist/
-__debug_bin*
+__debug_bin*
+
+# Go
+vendor

.golangci.yml

@@ -1,3 +1,6 @@
+# https://golangci-lint.run/usage/configuration
+version: "2"
+
 run:
   timeout: 5m
   tests: true
@@ -8,21 +11,37 @@ linters:
     - govet
     - errcheck
     - staticcheck
-    - gofmt
-    - goimports
     - revive
     - ineffassign
-    - typecheck
     - unused
-    - gosimple
     - misspell
     - nakedret
     - bodyclose
     - gocritic
     - makezero
     - gosec
+  settings:
+    staticcheck:
+      checks:
+        - all
+        - '-QF1008' # Allow embedded structs to be referenced by field
+        - '-ST1000' # Do not require package comments
+    revive:
+      rules:
+        - name: exported
+          disabled: true
+        - name: exported
+          disabled: true
+        - name: package-comments
+          disabled: true
+
+formatters:
+  enable:
+    - gofmt
+    - goimports
 
 output:
-  formats: colored-line-number
-  print-issued-lines: true
-  print-linter-name: true
+  formats:
+    text:
+      print-linter-name: true
+      print-issued-lines: true

CONTRIBUTING.md

@@ -15,7 +15,7 @@ Please note that this project is released with a [Contributor Code of Conduct](C
 These are one time installations required to be able to test your changes locally as part of the pull request (PR) submission process.
 
 1. install Go [through download](https://go.dev/doc/install) | [through Homebrew](https://formulae.brew.sh/formula/go)
-1. [install golangci-lint](https://golangci-lint.run/welcome/install/#local-installation)
+1. [install golangci-lint v2](https://golangci-lint.run/welcome/install/#local-installation)
 
 ## Submitting a pull request
 

Dockerfile

@@ -1,27 +1,26 @@
+FROM golang:1.24.3-alpine AS build
 ARG VERSION="dev"
 
-FROM golang:1.23.7 AS build
-# allow this step access to build arg
-ARG VERSION
 # Set the working directory
 WORKDIR /build
 
-RUN go env -w GOMODCACHE=/root/.cache/go-build
+# Install git
+RUN --mount=type=cache,target=/var/cache/apk \
+    apk add git
 
-# Install dependencies
-COPY go.mod go.sum ./
-RUN --mount=type=cache,target=/root/.cache/go-build go mod download
-
-COPY . ./
 # Build the server
-RUN --mount=type=cache,target=/root/.cache/go-build CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=${VERSION} -X main.commit=$(git rev-parse HEAD) -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
-    -o github-mcp-server cmd/github-mcp-server/main.go
+# go build automatically download required module dependencies to /go/pkg/mod
+RUN --mount=type=cache,target=/go/pkg/mod \
+    --mount=type=cache,target=/root/.cache/go-build \
+    --mount=type=bind,target=. \
+    CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=${VERSION} -X main.commit=$(git rev-parse HEAD) -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
+    -o /bin/github-mcp-server cmd/github-mcp-server/main.go
 
 # Make a stage to run the app
 FROM gcr.io/distroless/base-debian12
 # Set the working directory
 WORKDIR /server
 # Copy the binary from the build stage
-COPY --from=build /build/github-mcp-server .
+COPY --from=build /bin/github-mcp-server .
 # Command to run the server
 CMD ["./github-mcp-server", "stdio"]