From e150111b2798029ed199b31687268cd8e7bb36db Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Mon, 26 Jul 2021 11:28:25 -0700 Subject: [PATCH] dockerignore gets same contents as gitignore --- .dockerignore | 37 +++++++++++++++++++++++-------------- .gitignore | 6 +++--- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.dockerignore b/.dockerignore index 54175491..629c7adc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,14 +1,23 @@ -./.* -# Allow .git to get copied into the container so we can use it in hack/get-ldflags.sh during build. -!/.git -./*.md -./*.yaml -./apis -./deploy -./Dockerfile -./generated/1.1* -./internal/mocks -./LICENSE -./site/ -./test -**/*_test.go +# This is effectively a copy of the .gitignore file. +# The whole git repo, including the .git directory, should get copied into the Docker build context, +# to enable the use of hack/get-ldflags.sh inside the Dockerfile. +# When you change the .gitignore file, please consider also changing this file. + +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# GoLand +.idea + +# MacOS Desktop Services Store +.DS_Store diff --git a/.gitignore b/.gitignore index 78b4cf40..b6e1a6e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +# When you change this file, please consider also changing the .dockerignore file. +# See comments at the top of .dockerignore for more information. + # Binaries for programs and plugins *.exe *.exe~ @@ -11,9 +14,6 @@ # Output of the go coverage tool, specifically when used with LiteIDE *.out -# Dependency directories (remove the comment below to include it) -# vendor/ - # GoLand .idea