diff --git a/cmd/txgen/docker/Dockerfile b/cmd/txgen/docker/Dockerfile index 3bf08e249..82ef6f898 100644 --- a/cmd/txgen/docker/Dockerfile +++ b/cmd/txgen/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.12-alpine AS build +FROM golang:1.13-alpine AS build RUN mkdir -p /go/src/github.com/daglabs/btcd @@ -7,10 +7,6 @@ WORKDIR /go/src/github.com/daglabs/btcd RUN apk add --no-cache curl git -# GO111MODULE=on forces Go to use the go-module system -# TODO: remove this once Go 1.13 is released -ENV GO111MODULE=on - COPY go.mod . COPY go.sum . diff --git a/dnsseeder/README.md b/dnsseeder/README.md index 347a8c72f..cbe9145d5 100644 --- a/dnsseeder/README.md +++ b/dnsseeder/README.md @@ -23,19 +23,9 @@ Building or updating from source requires the following build dependencies: - **Vgo (Go 1.10 only)** - The `GO111MODULE` experiment is used to manage project dependencies and - provide reproducible builds. The module experiment is provided by the Go 1.11 - toolchain, but the Go 1.10 toolchain does not provide any module support. To - perform module-aware builds with Go 1.10, - [vgo](https://godoc.org/golang.org/x/vgo) (a drop-in replacement for the go - command) must be used instead. - To build and install from a checked-out repo, run `go install` in the repo's root directory. Some notes: -* Set the `GO111MODULE=on` environment variable if using Go 1.11 and building - from within `GOPATH`. - * Replace `go` with `vgo` when using Go 1.10. * The `dnsseeder` executable will be installed to `$GOPATH/bin`. `GOPATH` diff --git a/dnsseeder/docker/Dockerfile b/dnsseeder/docker/Dockerfile index 0bfdc6a3e..c5125ae1b 100644 --- a/dnsseeder/docker/Dockerfile +++ b/dnsseeder/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.12-alpine AS build +FROM golang:1.13-alpine AS build RUN mkdir -p /go/src/github.com/daglabs/btcd @@ -12,10 +12,6 @@ RUN go get -u golang.org/x/lint/golint \ github.com/opennota/check/cmd/structcheck \ github.com/opennota/check/cmd/varcheck -# GO111MODULE=on forces Go to use the go-module system -# TODO: remove this once Go 1.13 is released -ENV GO111MODULE=on - COPY go.mod . COPY go.sum . diff --git a/docker/Dockerfile b/docker/Dockerfile index a6a470c5a..a60cb453c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.12-alpine AS build +FROM golang:1.13-alpine AS build RUN mkdir -p /go/src/github.com/daglabs/btcd @@ -12,10 +12,6 @@ RUN go get -u golang.org/x/lint/golint \ github.com/opennota/check/cmd/structcheck \ github.com/opennota/check/cmd/varcheck -# GO111MODULE=on forces Go to use the go-module system -# TODO: remove this once Go 1.13 is released -ENV GO111MODULE=on - COPY go.mod . COPY go.sum . diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 87988457c..3799cef24 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,4 +1,4 @@ -FROM golang:1.12-alpine +FROM golang:1.13-alpine ENV PATH="${GOPATH}/bin:${PATH}" @@ -12,10 +12,6 @@ RUN apk add --no-cache libc6-compat RUN go get github.com/derekparker/delve/cmd/dlv -# GO111MODULE=on forces Go to use the go-module system -# TODO: remove this once Go 1.13 is released -ENV GO111MODULE=on - COPY go.mod . COPY go.sum . diff --git a/mining/simulator/docker/Dockerfile b/mining/simulator/docker/Dockerfile index c5fb7fe98..2cb37ddb9 100644 --- a/mining/simulator/docker/Dockerfile +++ b/mining/simulator/docker/Dockerfile @@ -1,5 +1,5 @@ # -- multistage docker build: stage #1: build stage -FROM golang:1.12-alpine AS build +FROM golang:1.13-alpine AS build RUN mkdir -p /go/src/github.com/daglabs/btcd @@ -7,10 +7,6 @@ WORKDIR /go/src/github.com/daglabs/btcd RUN apk add --no-cache curl git -# GO111MODULE=on forces Go to use the go-module system -# TODO: remove this once Go 1.13 is released -ENV GO111MODULE=on - COPY go.mod . COPY go.sum .