Sync with origin

.dockerignore

@@ -1,10 +1,8 @@
 .github/*
 exhaust/*
-pics/*
 remote-raw/*
 scripts/*
 .git
 .dockerignore
 README.md
-LICENSE
-Makefile
+LICENSE

.github/workflows/CI.yaml

@@ -1,64 +1,43 @@
 name: CI check on every PR
 on:
   pull_request:
-    branches:
-      - master
     paths-ignore:
       - '**.md'
       - 'Makefile'
       - 'config.json'
 
 jobs:
-  ci:
-    name: CI check on every push and PR
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Go
-        uses: actions/setup-go@v3
-        with:
-          go-version: '1.20'
-
-      - name: Setup necessary packages
-        run: |
-          sudo apt install libvips-dev -y
-
-      - name: run test cases
-        run: make && make test
-
   image-test:
-    name: Check for image build and CVE
+    name: Check for image build, testing and CVE
     runs-on: ubuntu-latest
+    permissions: 
+      pull-requests: write 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
-      - name: Cache Docker layers
-        uses: actions/cache@v2
+      - name: Make test
+        uses: docker/build-push-action@v6
         with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
+          context: .
+          file: ./Dockerfile.CI
+          load: true
+          tags: |
+            ghcr.io/${{ github.event.repository.full_name }}:latest
 
-      - name: Build and load image
-        uses: docker/build-push-action@v3
+      - name: Build image test
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true
           tags: |
             ghcr.io/${{ github.event.repository.full_name }}:latest
 
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-
       - name: Install trivy
         run: |
           wget -qO - https://aquasecurity.github.io/trivy-repo/deb/public.key | sudo apt-key add -
@@ -77,11 +56,12 @@ jobs:
         run: |
           echo "${{ steps.trivy.outputs.stdout }}"
 
-      - name: Comment PR
+      - name: Comment PR for CVE
         uses: thollander/actions-comment-pull-request@v2
         with:
           message: |
             ```
             ${{ steps.trivy.outputs.stdout }}
             ```
+          comment_tag: cve
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codecov.yaml

@@ -14,16 +14,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.23'
 
       - name: Setup necessary packages
         run: |
-          sudo apt install libvips-dev -y
+          sudo apt update && sudo apt install libvips-dev -y
 
       - name: run test cases
         run: make && make test

.github/workflows/codeql-analysis.yml

@@ -15,7 +15,6 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ master ]
   schedule:
     - cron: '32 20 * * 2'
@@ -33,38 +32,23 @@ jobs:
       fail-fast: false
       matrix:
         language: [ 'go' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
+
+    - name: Install Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: '1.23'
 
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
       uses: github/codeql-action/autobuild@v2
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

.github/workflows/integration-test.yaml

@@ -14,10 +14,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Install docker-compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
 
       - name: Build image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64
@@ -32,7 +37,7 @@ jobs:
       - name: Send Requests to Server
         run: |
           cd pics
-          find * -type f -print | xargs -I {} curl -H "User-Agent: Mozilla/5.0 Gecko/20100101 Firefox/98.0" http://localhost:3333/{}
+          find * -type f -print | xargs -I {} curl -o /dev/null -H "Accept: image/webp" --silent http://localhost:3333/{}
 
       - name: Get container RAM stats
         run: |
@@ -43,10 +48,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@v4
+
+      - name: Install docker-compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Build image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64
@@ -61,7 +71,7 @@ jobs:
       - name: Send Requests to Server
         run: |
           cd pics
-          find * -type f -print | xargs -I {} curl -H "User-Agent: Mozilla/5.0 Gecko/20100101 Firefox/98.0" http://localhost:3333/{}
+          find * -type f -print | xargs -I {} curl -o /dev/null -H "Accept: image/webp" --silent http://localhost:3333/{}
 
       - name: Get container RAM stats
         run: |

.github/workflows/release_binary.yaml

@@ -15,13 +15,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Make WebP Server Go (amd64)
         run: |

.github/workflows/release_docker_image.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -43,10 +43,10 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
         uses: actions/cache@v2
@@ -57,10 +57,10 @@ jobs:
             ${{ runner.os }}-buildx-
 
       - name: Build and push latest images
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           context: .
-          platforms: linux/arm,linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.20-bookworm as builder
+FROM golang:1.23-bookworm AS builder
 
 ARG IMG_PATH=/opt/pics
 ARG EXHAUST_PATH=/opt/exhaust
@@ -14,7 +14,12 @@ RUN cd /build && sed -i "s|.\/pics|${IMG_PATH}|g" config.json  \
 
 FROM debian:bookworm-slim
 
-RUN apt update && apt install --no-install-recommends libvips ca-certificates libjemalloc2 libtcmalloc-minimal4 -y && rm -rf /var/lib/apt/lists/* &&  rm -rf /var/cache/apt/archives/*
+RUN apt update && apt install --no-install-recommends libvips ca-certificates libjemalloc2 libtcmalloc-minimal4 curl -y && rm -rf /var/lib/apt/lists/* &&  rm -rf /var/cache/apt/archives/*
+
+COPY ./assets /build/assets
+# Install libam with correct arch
+RUN dpkg -i /build/assets/libaom3_3.11.0-1_$(dpkg --print-architecture).deb && \
+    rm /build/assets/libaom3_3.11.0-1_$(dpkg --print-architecture).deb
 
 COPY --from=builder /build/webp-server  /usr/bin/webp-server
 COPY --from=builder /build/config.json /etc/config.json

Dockerfile.CI

@@ -0,0 +1,11 @@
+FROM golang:1.23-bookworm AS builder
+
+ARG IMG_PATH=/opt/pics
+ARG EXHAUST_PATH=/opt/exhaust
+RUN apt update && apt install --no-install-recommends libvips-dev -y && mkdir /build
+COPY go.mod /build
+RUN cd /build && go mod download
+
+COPY . /build
+
+RUN cd /build && make && make test

Makefile

@@ -5,9 +5,11 @@ else
 endif
 
 ifeq ($(shell uname -m),aarch64)
-	ARCH=arm64
+    ARCH=arm64
+else ifeq ($(shell uname -m),arm64)
+    ARCH=arm64
 else
-	ARCH=amd64
+    ARCH=amd64
 endif
 
 default:
@@ -24,7 +26,7 @@ tools-dir:
 
 install-staticcheck: tools-dir
 	GOBIN=`pwd`/tools/bin go install honnef.co/go/tools/cmd/staticcheck@latest
-	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ./tools/bin v1.52.2
+	curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b ./tools/bin v1.59.1
 
 static-check: install-staticcheck
 	#S1000,SA1015,SA4006,SA4011,S1023,S1034,ST1003,ST1005,ST1016,ST1020,ST1021
@@ -35,8 +37,7 @@ test:
 	go test -v -coverprofile=coverage.txt -covermode=atomic ./...
 
 clean:
-	rm -rf prefetch remote-raw exhaust tools coverage.txt
-
+	rm -rf prefetch remote-raw exhaust tools coverage.txt metadata exhaust_test
 
 docker:
 	DOCKER_BUILDKIT=1 docker build -t webpsh/webps .