From 5eb7e5e1f2d7ad29c4b33d1b69a32798574cd5e2 Mon Sep 17 00:00:00 2001 From: Cnly Date: Sun, 6 Jan 2019 21:44:05 +0800 Subject: [PATCH] Fix build conflict between docker environment and host - #596 Signed-off-by: Alex Chen --- .gitignore | 1 + docker/docker-compose.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b60317da2..433f55799 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ /_obj /_test /vendor/bin +/docker/build # Architecture specific extensions/prefixes *.[568vq] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9d4312fb2..bde2f3336 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,6 +7,8 @@ services: build: ./ volumes: - ..:/build + - ./build/pkg:/build/pkg + - ./build/bin:/build/bin networks: - internal depends_on: