aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Chen <Cnly@users.noreply.github.com>2019-03-04 22:47:29 +0800
committerAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-03-04 14:47:29 +0000
commit5d2d0484d1f104bd09a187a2aaeccc0dcfe0765c (patch)
tree6c0cf5059b2ee430d3b402108d60ccda40dc4e6d
parent6baaf8c36cede54a47342c423bc57c9494c63e99 (diff)
Fix build conflict between docker environment and host - #596 (#598)
Signed-off-by: Alex Chen <minecnly@gmail.com>
-rw-r--r--.gitignore1
-rw-r--r--docker/docker-compose.yml2
2 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b60317da..433f5579 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 9d4312fb..bde2f333 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: