🚀 feat(Makefile): update Docker image build and push to use GitHub Container Registry

🔧 fix(main.go): log successful server shutdown message

🔄 chore(docker-image.yml): enhance CI workflow with caching and build optimizations

Author: w7years

.github/workflows/docker-image.yml

@@ -7,12 +7,58 @@ on:
     branches: [ "main" ]
 
 jobs:
-
   build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Cache Go modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            ~/go/pkg/mod
+            ~/.cache/go-build
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Cache Docker build
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install dependencies
+        run: make tidy
+
+      - name: Format code
+        run: make fmt
+
+      - name: Run static code analysis
+        run: make lint
+
+      - name: Run tests
+        run: make test
+
+      - name: Build and push Docker image
+        run: make docker-push
+        env:
+          VERSION: ${{ github.sha }}
+          GITHUB_USERNAME: ${{ github.actor }}

Makefile

@@ -4,7 +4,7 @@
 # Project related variables
 PROJECT_NAME := ai-api-proxy
 VERSION ?= v0.0.1
-DOCKER_USERNAME ?= wangwei01
+GITHUB_USERNAME ?= wangweix
 
 BASE_PATH := $(shell pwd)
 BUILD_PATH := $(BASE_PATH)/build
@@ -73,16 +73,15 @@ run: build
 # Build Docker image
 docker:
 	@echo "Build Docker image..."
-	@docker build -t $(PROJECT_NAME):$(VERSION) .
-	@echo "Add tag to docker image..."
-	@docker tag $(PROJECT_NAME):$(VERSION) $(DOCKER_USERNAME)/$(PROJECT_NAME):$(VERSION)
-	@docker tag $(PROJECT_NAME):$(VERSION) $(DOCKER_USERNAME)/$(PROJECT_NAME):latest
-	
+	@docker build . --file Dockerfile \
+		--tag ghcr.io/$(GITHUB_USERNAME)/$(PROJECT_NAME):latest \
+		--tag ghcr.io/$(GITHUB_USERNAME)/$(PROJECT_NAME):$(VERSION)
+
 # Push Docker image to registry
 docker-push: docker
-	@echo "Push Docker image to registry..."
-	@docker push $(DOCKER_USERNAME)/$(PROJECT_NAME):$(VERSION)
-	@docker push $(DOCKER_USERNAME)/$(PROJECT_NAME):latest
+	@echo "Push Docker image to GitHub Container Registry..."
+	@docker push ghcr.io/$(GITHUB_USERNAME)/$(PROJECT_NAME):latest
+	@docker push ghcr.io/$(GITHUB_USERNAME)/$(PROJECT_NAME):$(VERSION)
 
 # Display help information
 help:
@@ -97,8 +96,4 @@ help:
 	@echo "  run         - Run program"
 	@echo "  docker      - Build Docker image"
 	@echo "  docker-push - Push Docker image to registry"
-	@echo "  docker-run  - Run Docker container with external configuration file"
 	@echo "  help        - Display help information"
-
-
-	

cmd/proxy/main.go

@@ -114,7 +114,6 @@ func main() {
 		logger.Logger.Info("Received shutdown signal, shutting down server...")
 	case err := <-errChan:
 		logger.Logger.Errorf("Server error: %v", err)
-		quit <- syscall.SIGINT
 	}
 
 	// Graceful shutdown
@@ -123,5 +122,5 @@ func main() {
 	if err := srv.Shutdown(ctx); err != nil {
 		logger.Logger.Fatalf("Server shutdown failed: %v", err)
 	}
-	logger.Logger.Info("Server shutdown")
+	logger.Logger.Info("Server shutdown successfully")
 }