From bbbb0036df25d56766bc5ce869080bdf0265e511 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 17 Apr 2025 19:23:28 +0200 Subject: [PATCH] cleanup ignore files - We now only use winresources for the dockerd binary, so we can reduce some uses of wildcards - Use explicit ("/") to indicate these should only be ignored relative to the root of the repository and build-context - Remove remnant ignore for rpm builds Signed-off-by: Sebastiaan van Stijn --- .dockerignore | 10 ++++++---- .gitignore | 7 +++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.dockerignore b/.dockerignore index 71c1853815..e96d479eea 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,6 @@ -.git -bundles/ -cli/winresources/**/winres.json -cli/winresources/**/*.syso +/.git + +# build artifacts +/bundles/ +/cli/winresources/dockerd/winres.json +/cli/winresources/dockerd/*.syso diff --git a/.gitignore b/.gitignore index 9b2c8b9c51..1b8bf27fce 100644 --- a/.gitignore +++ b/.gitignore @@ -14,10 +14,9 @@ thumbs.db .editorconfig # build artifacts -bundles/ -cli/winresources/*/*.syso -cli/winresources/*/winres.json -contrib/builder/rpm/*/changelog +/bundles/ +/cli/winresources/dockerd/*.syso +/cli/winresources/dockerd/winres.json # ci artifacts *.exe