Merge pull request #2 from espressif/fix/docker_git

Fix git server in docker image

Author: kumekay

.github/workflows/test.yml

@@ -0,0 +1,124 @@
+name: Test and Build
+
+on:
+  push:
+    branches: [ master, main ]
+  pull_request:
+    branches: [ master, main ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.21'
+
+    - name: Cache Go modules
+      uses: actions/cache@v3
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
+
+    - name: Download dependencies
+      run: go mod download
+
+    - name: Verify dependencies
+      run: go mod verify
+
+    - name: Build
+      run: go build -v ./...
+
+    - name: Run tests
+      run: go test -race -coverprofile=coverage.out -covermode=atomic ./...
+
+    - name: Run go vet
+      run: go vet ./...
+
+    - name: Run go fmt
+      run: |
+        if [ "$(gofmt -s -l . | wc -l)" -gt 0 ]; then
+          echo "Code is not formatted properly:"
+          gofmt -s -l .
+          exit 1
+        fi
+
+  docker_and_integration_tests:
+    runs-on: ubuntu-latest
+    needs: test
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build Docker image
+      uses: docker/build-push-action@v5
+      with:
+        context: .
+        load: true
+        tags: git-mirror-server:dev
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+
+    - name: Test Docker image
+      run: |
+        # Start the container in background
+        docker run -d --name git-mirror-test \
+          -v ${{ github.workspace }}/example-config.toml:/config.toml \
+          git-mirror-server:dev /config.toml
+
+        # Wait a bit for the server to start
+        sleep 5
+
+        # Check if container is still running
+        if ! docker ps | grep git-mirror-test; then
+          echo "Container failed to start"
+          docker logs git-mirror-test
+          exit 1
+        fi
+
+        # Stop the container
+        docker stop git-mirror-test
+        docker rm git-mirror-test
+
+    - name: Create test config for integration
+      run: |
+        cat > test-config.toml << EOF
+        ListenAddr = ":8080"
+        BasePath = "/srv/git"
+        Interval = "10s" # Default update interval for repos
+
+        [[repo]]
+        Name = "github.com/espressif/git-mirror-server.git" # Explicitly set name
+        Origin = "https://github.com/espressif/git-mirror-server.git"
+        # Interval = "10s" # Specific interval for this repo (optional)
+        EOF
+
+    - name: Run integration test
+      run: |
+        # Start git-mirror-server
+        docker run -d --name git-mirror-integration \
+          -p 8080:8080 \
+          -v ${{ github.workspace }}/test-config.toml:/config.toml \
+          -v ${{ github.workspace }}/test-git-repos:/srv/git \
+          git-mirror-server:dev /config.toml
+
+        # Wait for server to start and first sync
+        echo "Waiting for server to start and initial sync..."
+        sleep 30 # Increased sleep to allow for cloning and initial setup
+
+        # Check container logs for any immediate errors
+        echo "Git mirror server logs:"
+        docker logs git-mirror-integration
+
+        # Test git clone
+        echo "Testing git clone..."
+        GIT_TRACE_PACKET=1 GIT_TRACE=1 GIT_CURL_VERBOSE=1 git clone --depth 1 http://localhost:8080/github.com/espressif/git-mirror-server.git test-clone
+        cd test-clone
+        git log -1 --oneline

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 as builder
+FROM golang:1.23 AS builder
 WORKDIR /app
 
 COPY go.mod ./
@@ -8,8 +8,8 @@ RUN go mod download
 COPY *.go ./
 RUN go build -o /git-mirror
 
-FROM alpine/git
-RUN apk add --no-cache libc6-compat
+FROM alpine:latest
+RUN apk add --no-cache git git-daemon libc6-compat
 WORKDIR /
 COPY --from=builder /git-mirror git-mirror
 ENTRYPOINT [ "/git-mirror" ]

README.md

@@ -1,18 +1,19 @@
-# git-mirror - simple Git mirrors
+# git-mirror-server - simple Git mirrors
 
-`git-mirror` is designed to create and serve read-only mirrors of your Git repositories locally or wherever you choose. A recent GitHub outage reinforces the fact that developers shouldn't be relying on a single remote for hosting code.
+`git-mirror` is designed to create and serve read-only mirrors of your Git repositories locally or wherever you choose.
+The server uses Git's smart HTTP protocol via `git http-backend` to provide efficient repository access.
 
 A major design goal of `git-mirror` is that it should just work with as little configuration as possible.
 
 ## Get started
 
-Download and extract the latest release from the [releases page](https://github.com/beefsack/git-mirror/releases).
+Download and extract the latest release from the [releases page](https://github.com/espressif/git-mirror-server/releases).
 
 Create `config.toml` similar to:
 
 ```toml
 [[repo]]
-Origin = "https://github.com/beefsack/git-mirror.git"
+Origin = "https://github.com/espressif/git-mirror-server.git"
 ```
 
 By default it will update the mirror every **1 minute** and will serve the mirror over HTTP using port **8080**. You can specify as many repos as you want by having multiple `[[repo]]` sections.
@@ -22,15 +23,15 @@ Run `git-mirror` with the path to the config file:
 ```bash
 $ ./git-mirror config.toml
 2015/05/07 11:08:06 starting web server on :8080
-2015/05/07 11:08:06 updating github.com/beefsack/git-mirror.git
-2015/05/07 11:08:08 updated github.com/beefsack/git-mirror.git
+2015/05/07 11:08:06 updating github.com/espressif/git-mirror-server.git
+2015/05/07 11:08:08 updated github.com/espressif/git-mirror-server.git
 ```
 
 Now you can clone from your mirror on the default port of `8080`:
 
 ```bash
-$ git clone http://localhost:8080/github.com/beefsack/git-mirror.git
-Cloning into 'git-mirror'...
+$ git clone http://localhost:8080/github.com/espressif/git-mirror-server.git
+Cloning into 'git-mirror-server'...
 Checking connectivity... done.
 ```
 
@@ -39,15 +40,15 @@ Checking connectivity... done.
 You can run it with docker:
 
 ```
-docker run --rm -ti -v /your_config/path:/config  kumekay/git-mirror /config/config.toml
+docker run --rm -ti -v /your_config/path:/config espressif/git-mirror-server /config/config.toml
 ```
 
 Or with docker compose, for example:
 
 ```
 services:
   git-mirror:
-    image: kumekay/git-mirror
+    image: espressif/git-mirror-server
     ports:
       - "8080:8080"
     command: ["/etc/git-mirror/config.toml"]
@@ -61,6 +62,6 @@ services:
 
 See [the example config](example-config.toml) for more advanced configurations.
 
-## Authentication and authorisation
+## Authentication and authorization
 
 If you wish to control access to the mirror or specific repositories, consider proxying to `git-mirror` using a web server such as Nginx.

example-config.toml

@@ -10,9 +10,9 @@ BasePath = "/opt/git-mirror/data"
 # An example of a public mirror taking defaults from above.  The Name is
 # generated from the URL by just taking the host and path.
 #
-# Will be mirrored at at http://localhost:8080/github.com/beefsack/git-mirror.git
+# Will be mirrored at at http://localhost:8080/github.com/espressif/git-mirror-server.git
 [[Repo]]
-Origin = "https://github.com/beefsack/git-mirror.git"
+Origin = "https://github.com/espressif/git-mirror-server.git"
 
 # It is also possible to set custom names for accessing the repos.
 #

main.go

@@ -13,7 +13,7 @@ import (
 func main() {
 	// Parse config.
 	if len(os.Args) != 2 {
-		log.Fatal("please specify the path to a config file, an example config is available at https://github.com/beefsack/git-mirror/blob/master/example-config.toml")
+		log.Fatal("please specify the path to a config file, an example config is available at https://github.com/espressif/git-mirror-server/blob/master/example-config.toml")
 	}
 	cfg, repos, err := parseConfig(os.Args[1])
 	if err != nil {