rebase upstream

.clang-format

@@ -0,0 +1,16 @@
+BasedOnStyle: GNU
+AccessModifierOffset: -2
+AlignAfterOpenBracket: DontAlign
+AlignEscapedNewlines: DontAlign
+AlignOperands: DontAlign
+AllowAllArgumentsOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Stroustrup
+IndentWidth: 2
+SortIncludes: Never
+SpaceAfterCStyleCast: true
+SpaceBeforeParens: ControlStatements
+TabWidth: 2
+UseTab: Never
+ColumnLimit: 0

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: imgproxy

.github/workflows/Dockerfile → .github/ci-docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bullseye-slim
+FROM debian:stable-slim
 
 RUN apt-get -qq update \
   && apt-get install -y --no-install-recommends \
@@ -7,8 +7,11 @@ RUN apt-get -qq update \
     git \
     ca-certificates \
     build-essential \
-    ninja-build \
+    gobject-introspection \
+    libgirepository1.0-dev \
     python3-pip \
+    python3-venv \
+    libssl-dev \
     libglib2.0-dev \
     libxml2-dev \
     libjpeg-dev \
@@ -25,14 +28,27 @@ RUN apt-get -qq update \
     libopencv-imgproc-dev \
     libopencv-objdetect-dev \
     libopencv-dnn-dev \
-  && pip install --force meson \
+  && python3 -m venv /root/.python \
+  && /root/.python/bin/pip install meson ninja \
   && rm -rf /var/lib/apt/lists/*
 
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
+  && export PATH="/root/.cargo/bin:$PATH" \
+  && cargo install cargo-c \
+  && cd /root \
+  && git clone --depth 1 https://github.com/DarthSim/quantizr.git \
+  && cd quantizr \
+  && cargo cinstall --release --library-type=cdylib \
+  && rm -rf /root/.rustup /root/.cargo
+
+ENV PATH="/root/.python/bin:$PATH"
+ENV LD_LIBRARY_PATH="/usr/local/lib"
+
 RUN \
   mkdir /root/vips \
     && cd /root/vips \
     && curl -s -S -L -o vips_releases.json "https://api.github.com/repos/libvips/libvips/releases" \
-    && for VIPS_VERSION in "8.13" "8.14"; do \
+    && for VIPS_VERSION in "8.13" "8.14" "8.15"; do \
       mkdir $VIPS_VERSION \
       && export VIPS_RELEASE=$(grep -m 1 "\"tag_name\": \"v$VIPS_VERSION." vips_releases.json | sed -E 's/.*"v([^"]+)".*/\1/') \
       && echo "Building Vips $VIPS_RELEASE as $VIPS_VERSION" \
@@ -45,7 +61,6 @@ RUN \
         --prefix=/root/vips/$VIPS_VERSION \
         --libdir=lib \
         -Dgtk_doc=false \
-        -Dintrospection=false \
       && ninja -C _build \
       && ninja -C _build install \
       && cd .. \

.github/ci-docker/hooks/push

@@ -0,0 +1,4 @@
+#!/bin/bash
+DATETAG=$(date +%Y%m%d%H%M)
+docker tag $IMAGE_NAME $DOCKER_REPO:$DATETAG
+docker push $DOCKER_REPO:$DATETAG

.github/workflows/lint.yml

@@ -11,11 +11,11 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: darthsim/imgproxy-ci:202302212110
+      image: darthsim/imgproxy-ci:202311211816
     strategy:
       matrix:
-        go-version: ["1.20.4"]
-        vips-version: ["8.14"]
+        go-version: ["1.21.4"]
+        vips-version: ["8.15"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -34,9 +34,9 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.51.2
+          version: v1.55.0
           args: --timeout 5m0s
           skip-cache: true
         env:
-          LD_LIBRARY_PATH: "${{ env.LD_LIBRARY_PATH }}:/root/vips/${{ matrix.vips-version }}/lib"
-          PKG_CONFIG_PATH: "${{ env.PKG_CONFIG_PATH }}:/root/vips/${{ matrix.vips-version }}/lib/pkgconfig"
+          LD_LIBRARY_PATH: "/usr/local/lib:/root/vips/${{ matrix.vips-version }}/lib"
+          PKG_CONFIG_PATH: "/usr/local/lib/pkgconfig:/root/vips/${{ matrix.vips-version }}/lib/pkgconfig"

.github/workflows/test.yml

@@ -11,11 +11,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: darthsim/imgproxy-ci:202302212110
+      image: darthsim/imgproxy-ci:202311211816
     strategy:
       matrix:
-        go-version: ["1.20.4"]
-        vips-version: ["8.14"]
+        go-version: ["1.21.4"]
+        vips-version: ["8.15"]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -34,5 +34,5 @@ jobs:
       - name: Test
         run: go test ./...
         env:
-          LD_LIBRARY_PATH: "${{ env.LD_LIBRARY_PATH }}:/root/vips/${{ matrix.vips-version }}/lib"
-          PKG_CONFIG_PATH: "${{ env.PKG_CONFIG_PATH }}:/root/vips/${{ matrix.vips-version }}/lib/pkgconfig"
+          LD_LIBRARY_PATH: "/usr/local/lib:/root/vips/${{ matrix.vips-version }}/lib"
+          PKG_CONFIG_PATH: "/usr/local/lib/pkgconfig:/root/vips/${{ matrix.vips-version }}/lib/pkgconfig"

.golangci.yml

@@ -6,7 +6,6 @@ run:
 linters:
   disable-all: true
   enable:
-    - deadcode
     # - errcheck
     - gocritic
     # - goconst
@@ -15,11 +14,9 @@ linters:
     - govet
     - ineffassign
     - staticcheck
-    - structcheck
     - stylecheck
     - typecheck
     - unused
-    - varcheck
 
 linters-settings:
   govet:

.lefthook/pre-commit/lint

@@ -1,12 +1,13 @@
 #!/bin/sh
 
-if ! git diff --staged --name-only | grep -qe ".*\.go$"; then
+if ! git diff --staged --name-only | grep -qE ".*\.go$|\.golangci\.yml$"; then
   echo "Nothing to lint"
   exit 0;
 fi
 
 if [ -x "$(which brew)" ]; then
   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(brew --prefix libffi)/lib/pkgconfig"
+  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(brew --prefix libarchive)/lib/pkgconfig"
 fi
 
 export CGO_LDFLAGS_ALLOW="-s|-w"

.lefthook/pre-push/test

@@ -2,6 +2,7 @@
 
 if [ -x "$(which brew)" ]; then
   export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(brew --prefix libffi)/lib/pkgconfig"
+  export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(brew --prefix libarchive)/lib/pkgconfig"
 fi
 
 export CGO_LDFLAGS_ALLOW="-s|-w"