Merge branch 'main' into cli_username_password_env_vars

This commit is contained in:
Ryan Richard 2021-07-26 17:04:46 -07:00
commit 295f013580
2 changed files with 26 additions and 17 deletions

View File

@ -1,14 +1,23 @@
./.* # This is effectively a copy of the .gitignore file.
# Allow .git to get copied into the container so we can use it in hack/get-ldflags.sh during build. # The whole git repo, including the .git directory, should get copied into the Docker build context,
!/.git # to enable the use of hack/get-ldflags.sh inside the Dockerfile.
./*.md # When you change the .gitignore file, please consider also changing this file.
./*.yaml
./apis # Binaries for programs and plugins
./deploy *.exe
./Dockerfile *.exe~
./generated/1.1* *.dll
./internal/mocks *.so
./LICENSE *.dylib
./site/
./test # Test binary, built with `go test -c`
**/*_test.go *.test
# Output of the go coverage tool, specifically when used with LiteIDE
*.out
# GoLand
.idea
# MacOS Desktop Services Store
.DS_Store

6
.gitignore vendored
View File

@ -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 # Binaries for programs and plugins
*.exe *.exe
*.exe~ *.exe~
@ -11,9 +14,6 @@
# Output of the go coverage tool, specifically when used with LiteIDE # Output of the go coverage tool, specifically when used with LiteIDE
*.out *.out
# Dependency directories (remove the comment below to include it)
# vendor/
# GoLand # GoLand
.idea .idea