From 4bca7342d3ade4b67f905edb5dc34da57c657b1e Mon Sep 17 00:00:00 2001 From: Svarog Date: Thu, 26 Mar 2020 17:50:09 +0200 Subject: [PATCH] [NOD-883] Fix dockerfile in kaspaminer + set real version for go-libsecp256k1 (#673) --- cmd/kaspaminer/docker/Dockerfile | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/kaspaminer/docker/Dockerfile b/cmd/kaspaminer/docker/Dockerfile index d8a4790c5..6aa3f3861 100644 --- a/cmd/kaspaminer/docker/Dockerfile +++ b/cmd/kaspaminer/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.13-alpine AS build +FROM golang:1.14-alpine AS build RUN mkdir -p /go/src/github.com/kaspanet/kaspad @@ -20,7 +20,7 @@ WORKDIR /go/src/github.com/kaspanet/kaspad/cmd/kaspaminer RUN GOFMT_RESULT=`go fmt ./...`; echo $GOFMT_RESULT; test -z "$GOFMT_RESULT" RUN go vet ./... RUN golint -set_exit_status ./... -RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o kaspaminer . +RUN GOOS=linux go build -a -installsuffix cgo -o kaspaminer . # --- multistage docker build: stage #2: runtime image FROM alpine diff --git a/go.mod b/go.mod index da1e37295..646cfaebd 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/golang/snappy v0.0.1 // indirect github.com/jessevdk/go-flags v1.4.0 github.com/jrick/logrotate v1.0.0 - github.com/kaspanet/go-secp256k1 v0.0.0-20200326113007-add33b62838a + github.com/kaspanet/go-secp256k1 v0.0.2 github.com/kr/pretty v0.1.0 // indirect github.com/pkg/errors v0.9.1 github.com/syndtr/goleveldb v1.0.0 diff --git a/go.sum b/go.sum index 700a98e2b..367c3ef64 100644 --- a/go.sum +++ b/go.sum @@ -21,8 +21,8 @@ github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGAR github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jrick/logrotate v1.0.0 h1:lQ1bL/n9mBNeIXoTUoYRlK4dHuNJVofX9oWqBtPnSzI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= -github.com/kaspanet/go-secp256k1 v0.0.0-20200326113007-add33b62838a h1:/7JHxqxFvfuUr+u8k8kZ4R8Gjyb0TZnvYXrMyGjEAN0= -github.com/kaspanet/go-secp256k1 v0.0.0-20200326113007-add33b62838a/go.mod h1:W9OcWBKzH8P/PN2WAUn9k2YmZG/Uc660WAL1NTS3G3M= +github.com/kaspanet/go-secp256k1 v0.0.2 h1:KZGXddYHxzS02rx6EPPQYYe2tZ/rREj4P6XxgQQwQIw= +github.com/kaspanet/go-secp256k1 v0.0.2/go.mod h1:W9OcWBKzH8P/PN2WAUn9k2YmZG/Uc660WAL1NTS3G3M= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=