From 6be6b0de7efc2adf5714d9f095deda45dbed3413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C4=85tkowski?= Date: Fri, 5 Aug 2022 01:18:35 +0200 Subject: [PATCH] Bump GoLand to 1.19, fix building --- Dockerfile.magneticod | 3 ++- Dockerfile.magneticow | 5 +++-- cmd/magneticow/api.go | 3 +-- go.mod | 49 ++++++++++++++++++++++++++++++++++++------- 4 files changed, 47 insertions(+), 13 deletions(-) diff --git a/Dockerfile.magneticod b/Dockerfile.magneticod index c0c876f..4ed1ca3 100644 --- a/Dockerfile.magneticod +++ b/Dockerfile.magneticod @@ -1,4 +1,4 @@ -FROM golang:1.15-alpine AS build +FROM golang:1.19-alpine AS build WORKDIR /magnetico RUN apk add --no-cache build-base curl git @@ -6,6 +6,7 @@ RUN apk add --no-cache build-base curl git ADD ./Makefile /magnetico/ ADD ./pkg /magnetico/pkg ADD ./go.mod /magnetico/go.mod +ADD ./go.sum /magnetico/go.sum ADD ./cmd/magneticod /magnetico/cmd/magneticod RUN make magneticod diff --git a/Dockerfile.magneticow b/Dockerfile.magneticow index 1442242..8e3499e 100644 --- a/Dockerfile.magneticow +++ b/Dockerfile.magneticow @@ -1,13 +1,14 @@ -FROM golang:1.15-alpine AS build +FROM golang:1.19-alpine AS build WORKDIR /magnetico RUN export PATH=$PATH:/go/bin RUN apk add --no-cache build-base curl git -RUN go get -u github.com/kevinburke/go-bindata/... +RUN go install -a -v github.com/go-bindata/go-bindata/...@latest ADD ./Makefile /magnetico/ ADD ./pkg /magnetico/pkg ADD ./go.mod /magnetico/go.mod +ADD ./go.sum /magnetico/go.sum ADD ./cmd/magneticow /magnetico/cmd/magneticow RUN make magneticow diff --git a/cmd/magneticow/api.go b/cmd/magneticow/api.go index f0573ed..5425212 100644 --- a/cmd/magneticow/api.go +++ b/cmd/magneticow/api.go @@ -6,7 +6,6 @@ import ( "encoding/json" "fmt" "io" - "io/ioutil" "net/http" "os" "strconv" @@ -31,7 +30,7 @@ func NewApiReadmeHandler() (*ApiReadmeHandler, error) { h := new(ApiReadmeHandler) var err error - h.tempdir, err = ioutil.TempDir("", "magneticod_") + h.tempdir, err = os.MkdirTemp("", "magneticod_") if err != nil { return nil, err } diff --git a/go.mod b/go.mod index 8627b50..6bbe906 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,17 @@ module github.com/boramalper/magnetico -go 1.15 +go 1.19 require ( github.com/Wessie/appdirs v0.0.0-20141031215813-6573e894f8e2 - github.com/anacrolix/dht v1.0.1 // indirect github.com/anacrolix/missinggo v1.2.1 - github.com/anacrolix/missinggo/v2 v2.4.0 // indirect github.com/anacrolix/torrent v1.14.0 - github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect github.com/dustin/go-humanize v1.0.0 - github.com/google/pprof v0.0.0-20190515194954-54271f7e092f // indirect github.com/gorilla/mux v1.7.4 github.com/gorilla/schema v1.1.0 github.com/iwanbk/gobeanstalk v0.0.0-20160903043409-dbbb23937c31 github.com/jackc/pgx/v4 v4.9.2 github.com/jessevdk/go-flags v1.4.0 - github.com/kevinburke/go-bindata v3.16.0+incompatible // indirect github.com/libp2p/go-sockaddr v0.0.1 github.com/mattn/go-sqlite3 v2.0.3+incompatible github.com/pkg/errors v0.9.1 @@ -24,10 +19,48 @@ require ( github.com/willf/bloom v2.0.3+incompatible go.uber.org/zap v1.14.0 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 - golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect - golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 // indirect golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae golang.org/x/text v0.3.3 + github.com/RoaringBitmap/roaring v0.4.21 // indirect + github.com/anacrolix/dht/v2 v2.5.0 // indirect + github.com/anacrolix/go-libutp v1.0.2 // indirect + github.com/anacrolix/log v0.6.0 // indirect + github.com/anacrolix/missinggo/perf v1.0.0 // indirect + github.com/anacrolix/missinggo/v2 v2.4.0 // indirect + github.com/anacrolix/mmsg v1.0.0 // indirect + github.com/anacrolix/multiless v0.0.0-20191223025854-070b7994e841 // indirect + github.com/anacrolix/stm v0.2.0 // indirect + github.com/anacrolix/sync v0.2.0 // indirect + github.com/anacrolix/upnp v0.1.1 // indirect + github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572 // indirect + github.com/benbjohnson/immutable v0.2.0 // indirect + github.com/bradfitz/iter v0.0.0-20191230175014-e8f45d346db8 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/edsrzf/mmap-go v1.0.0 // indirect + github.com/etcd-io/bbolt v1.3.3 // indirect + github.com/glycerine/go-unsnap-stream v0.0.0-20190901134440-81cf024a9e0a // indirect + github.com/golang/snappy v0.0.1 // indirect + github.com/google/btree v1.0.0 // indirect + github.com/huandu/xstrings v1.3.0 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.7.2 // 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.1 // indirect + github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae // indirect + github.com/philhofer/fwd v1.0.0 // indirect + github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/tinylib/msgp v1.1.1 // indirect + github.com/willf/bitset v1.1.10 // indirect + go.uber.org/atomic v1.6.0 // indirect + go.uber.org/multierr v1.5.0 // indirect + golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect + golang.org/x/net v0.0.0-20200222125558-5a598a2470a0 // indirect + golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect golang.org/x/tools v0.0.0-20200221224223-e1da425f72fd // indirect + golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect honnef.co/go/tools v0.0.1-2020.1.3 // indirect )