Bump to vips v8.10.6 and matching govips

Dockerfile

@@ -4,11 +4,11 @@ RUN apt -y update && \
     apt -y install libglib2.0-dev libexpat1-dev libjpeg-dev libpng-dev libgif-dev
 WORKDIR /go/src/image-transformer
 COPY . .
-RUN wget https://github.com/libvips/libvips/releases/download/v8.7.3/vips-8.7.3.tar.gz && \
+RUN wget https://github.com/libvips/libvips/releases/download/v8.10.6/vips-8.10.6.tar.gz && \
-    tar xvzf vips-8.7.3.tar.gz && \
+    tar xvzf vips-8.10.6.tar.gz && \
-    cd vips-8.7.3 && \
+    cd vips-8.10.6 && \
     ./configure && \
     make && \
     make install && \
     ldconfig
-RUN go get -v -u github.com/davidbyttow/govips/pkg/vips && go install -v ./...
+RUN go get -v -u github.com/davidbyttow/govips/v2/vips && go install -v ./...

go.mod

@@ -0,0 +1,5 @@
+module git.dnix.de/an/image-transformer
+
+go 1.16
+
+require github.com/davidbyttow/govips/v2 v2.6.0

go.sum

@@ -0,0 +1,32 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davidbyttow/govips/v2 v2.6.0 h1:j7w7Y95NALChPdCYJ5laoQOwWFRsgZcGATKBPDPYW/Y=
+github.com/davidbyttow/govips/v2 v2.6.0/go.mod h1:goq38QD8XEMz2aWEeucEZqRxAWsemIN40vbUqfPfTAw=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5 h1:QelT11PB4FXiDEXucrfNckHoFxwt8USGY1ajP1ZF5lM=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102 h1:42cLlJJdEh+ySyeUUbEQ5bsTiq8voBeTuweGVkY6Puw=
+golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
+golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/davidbyttow/govips/pkg/vips"
+	"github.com/davidbyttow/govips/v2/vips"
 )
 
 var (
@@ -90,9 +90,27 @@ func resizeHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
+		img, err := vips.NewImageFromReader(resp.Body)
+		if err != nil {
+			writeError(w, imgPath, method, fmt.Sprintf("%v", err), http.StatusInternalServerError)
+			return
+		}
+		err = img.Thumbnail(iw, ih, 0)
+		if err != nil {
+			writeError(w, imgPath, method, fmt.Sprintf("%v", err), http.StatusInternalServerError)
+			return
+		}
+		ep := vips.NewDefaultExportParams()
+		buf, _, _ := img.Export(ep)
+		_, err = w.Write(buf)
+		if err != nil {
+			writeError(w, imgPath, method, fmt.Sprintf("%v", err), http.StatusInternalServerError)
+			return
+		}
+		
 		// govips returns the output of the image as a []byte object. We don't need
 		// it since we are directly piping it to the ResponseWriter
-		_, _, err = vips.NewTransform().
+		/*_, _, err = vips.NewTransform().
 			Load(resp.Body).
 			ResizeStrategy(vips.ResizeStrategyAuto).
 			Resize(iw, ih).
@@ -103,6 +121,8 @@ func resizeHandler(w http.ResponseWriter, r *http.Request) {
 			writeError(w, imgPath, method, "failed to resize", http.StatusInternalServerError)
 			return
 		}
+		*/
+		
 	case "thumbnail":
 
 	default: