From a72ea845b2d02d3143b73a52200e549a14d9dd67 Mon Sep 17 00:00:00 2001 From: Zhang Minghan Date: Thu, 25 Jan 2024 16:14:12 +0800 Subject: [PATCH] feat: support arm64 in stable image --- .github/workflows/docker-cd.yaml | 14 ++++++++++---- utils/char.go | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker-cd.yaml b/.github/workflows/docker-cd.yaml index 81e2c51..cbec8df 100644 --- a/.github/workflows/docker-cd.yaml +++ b/.github/workflows/docker-cd.yaml @@ -19,8 +19,14 @@ jobs: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - name: Build the Docker image - run: docker build . --file Dockerfile --tag programzmh/chatnio:stable + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 - - name: Push to DockerHub - run: docker push programzmh/chatnio:stable + - name: Build and push Docker images + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + tags: programzmh/chatnio:stable diff --git a/utils/char.go b/utils/char.go index 25c3a93..56e1a23 100644 --- a/utils/char.go +++ b/utils/char.go @@ -167,7 +167,7 @@ func ExtractUrls(data string) []string { func ExtractImageUrls(data string) []string { // https://platform.openai.com/docs/guides/vision/what-type-of-files-can-i-upload - re := regexp.MustCompile(`(https?://\S+\.(?:png|jpg|jpeg|gif|webp|heif|heic))`) + re := regexp.MustCompile(`(https?://\S+\.(?:png|jpg|jpeg|gif|webp|heif|heic)(?:\s\S+)?)`) return re.FindAllString(strings.ToLower(data), -1) }