From 312bab0843584f084ec701056c4573369a5a2cca Mon Sep 17 00:00:00 2001 From: Ignacio Hagopian Date: Mon, 6 Apr 2020 11:25:18 -0300 Subject: [PATCH] docker: fix build, upgrade Go Signed-off-by: Ignacio Hagopian --- .gitignore | 1 - tools/dockers/docker-examples/basic-miner-busybox/Dockerfile | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d841170a8..6aaaf9240 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,6 @@ /cmd/lotus-townhall/townhall/node_modules /cmd/lotus-townhall/townhall/build extern/filecoin-ffi/rust/target -**/*.h **/*.a **/*.pc /**/*/.DS_STORE diff --git a/tools/dockers/docker-examples/basic-miner-busybox/Dockerfile b/tools/dockers/docker-examples/basic-miner-busybox/Dockerfile index e740723a8..5464a81bf 100644 --- a/tools/dockers/docker-examples/basic-miner-busybox/Dockerfile +++ b/tools/dockers/docker-examples/basic-miner-busybox/Dockerfile @@ -1,9 +1,9 @@ -FROM golang:1.13-buster +FROM golang:1.14.1-buster MAINTAINER ldoublewood ENV SRC_DIR /lotus -RUN apt-get update && apt-get install -y && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev +RUN apt-get update && apt-get install -y ca-certificates llvm clang mesa-opencl-icd ocl-icd-opencl-dev jq RUN curl -sSf https://sh.rustup.rs | sh -s -- -y