Merge branch 'iss85-upgrade-deps' into v2

.github/workflows/test.yml

@@ -7,13 +7,13 @@ jobs:
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
     - name: Install Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.16.x
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - uses: actions/cache@v2
+        go-version: 1.20.x
+    - uses: actions/cache@v3
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.17.1-bullseye as build
+FROM golang:1.20.1-bullseye as build
 RUN mkdir /app
 COPY . /app
 RUN cd /app; ./build.sh
 
-FROM debian:10.9-slim as ponylib
+FROM debian:10.13-slim as ponylib
 LABEL org.opencontainers.image.title="Ponylib v2"
 LABEL org.opencontainers.image.description="Fb2 library with CLI & web UI"
 LABEL org.opencontainers.image.authors="Nikita Kovalev <https://github.com/maizy>"

cmd/ponylib/cmd/scan.go

@@ -7,7 +7,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/gofrs/uuid"
+	"github.com/gofrs/uuid/v5"
 	"github.com/jackc/pgx/v4/pgxpool"
 	"github.com/spf13/cobra"
 

docs/docker-compose/docker-compose.yml

@@ -4,7 +4,7 @@
 version: "3.5"
 services:
   ponylib:
-    image: ghcr.io/maizy/ponylib:v2.0.1
+    image: ghcr.io/maizy/ponylib:v2.0.3
     container_name: ponylib
     command: ["web-ui"]
     ports:

fb2_scanner/target.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gofrs/uuid"
+	"github.com/gofrs/uuid/v5"
 
 	"dev.maizy.ru/ponylib/fb2_scanner/resource"
 	"dev.maizy.ru/ponylib/internal/u"

go.mod

@@ -1,51 +1,55 @@
 module dev.maizy.ru/ponylib
 
-go 1.17
+go 1.20
 
 require (
-	github.com/antchfx/xmlquery v1.3.3
-	github.com/gabriel-vasile/mimetype v1.1.2
-	github.com/gin-gonic/gin v1.7.7
-	github.com/go-playground/validator/v10 v10.5.0 // indirect
-	github.com/gofrs/uuid v4.0.0+incompatible
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/jackc/pgx/v4 v4.10.1
-	github.com/json-iterator/go v1.1.10 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/antchfx/xmlquery v1.3.15
+	github.com/gabriel-vasile/mimetype v1.4.1
+	github.com/gin-gonic/gin v1.9.0
+	github.com/gofrs/uuid/v5 v5.0.0
+	github.com/jackc/pgx/v4 v4.18.0
 	github.com/mitchellh/go-wordwrap v1.0.1
-	github.com/spf13/cobra v1.1.3
-	github.com/stretchr/testify v1.6.1
+	github.com/spf13/cobra v1.6.1
+	github.com/stretchr/testify v1.8.1
 	github.com/vfaronov/httpheader v0.1.0
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
-	golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57 // indirect
-	golang.org/x/text v0.3.6 // indirect
 )
 
 require (
-	github.com/antchfx/xpath v1.1.10 // indirect
+	github.com/antchfx/xpath v1.2.3 // indirect
+	github.com/bytedance/sonic v1.8.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-playground/locales v0.13.0 // indirect
-	github.com/go-playground/universal-translator v0.17.0 // indirect
-	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.11.2 // indirect
+	github.com/goccy/go-json v0.10.0 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.8.0 // indirect
+	github.com/jackc/pgconn v1.14.0 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.0.6 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.6.2 // indirect
-	github.com/jackc/puddle v1.1.3 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/jackc/puddle v1.3.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.6 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/ugorji/go/codec v1.2.5 // indirect
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
-	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
-	google.golang.org/protobuf v1.26.0 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.9 // indirect
+	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/protobuf v1.28.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )