Merge pull request #1516 from jsign/jsign/fixdockerfile

docker: fix build, upgrade Go
filecoin-project · Apr 8, 2020 · 4a32556 · 4a32556
2 parents b59f1a5 + c9dae72
commit 4a32556
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -1,9 +1,9 @@
-FROM golang:1.13-buster
+FROM golang:1.14.1-buster
 MAINTAINER ldoublewood <ldoublewood@gmail.com>
 
 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