diff --git a/Dockerfile b/Dockerfile index 9fd5af1..16e7923 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Start from golang base image -FROM golang:1.18.2-alpine3.15 as builder +FROM golang:alpine as builder # Install git. (alpine image does not have git in it) RUN apk update && apk add --no-cache git curl @@ -34,7 +34,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o ./bin/gropple . # Finally our multi-stage to build a small image # Start a new stage from scratch -FROM alpine:3.15.4 +FROM golang:alpine # Copy the Pre-built binary file COPY --from=builder /app/bin/gropple . diff --git a/docker-compose.yml b/docker-compose.yml index ccfd25e..9fcafa4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,8 @@ services: build: . image: tardisx/gropple:latest volumes: - - /tmp/gropple-config-dir/:/config - - /tmp/downloads:/downloads/ + - ./gropple-config-dir:/config + - ./downloads:/downloads/ restart: always ports: - "6123:6123" diff --git a/go.mod b/go.mod index 218ef96..0d5e5ba 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/tardisx/gropple -go 1.16 +go 1.20 require ( github.com/gorilla/mux v1.8.0 diff --git a/go.sum b/go.sum index 33c1657..944acbb 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,7 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= diff --git a/main.go b/main.go index a4502b9..c69f08c 100644 --- a/main.go +++ b/main.go @@ -25,7 +25,7 @@ var downloadId = 0 var configService *config.ConfigService var versionInfo = version.Manager{ - VersionInfo: version.Info{CurrentVersion: "v0.6.0"}, + VersionInfo: version.Info{CurrentVersion: "v0.6.0-alpha.1"}, } //go:embed web @@ -236,7 +236,6 @@ func configRESTHandler(w http.ResponseWriter, r *http.Request) { w.Write(b) } -// func fetchInfoOneRESTHandler(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) idString := vars["id"]