Skip to content

Dockerignore: convert to whitelist #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alxndrsn wants to merge 32 commits into
base: next
Choose a base branch
from
Open

Dockerignore: convert to whitelist #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5699ebe
Dockerignore: convert to whitelist
Oct 5, 2024
5061301
Include .git directories
Oct 5, 2024
73630f1
Increase expected context size
Oct 5, 2024
3b9ddda
trim client whitelist
Oct 9, 2024
45a9d8c
Merge branch 'next' into test-docker-context
Feb 13, 2025
ee8a637
fix for_humans() output
Feb 13, 2025
aec3a92
fix bugs in script
Feb 13, 2025
4454222
Merge branch 'next' into test-docker-context
alxndrsn Mar 12, 2025
9cfa725
Merge branch 'next' into test-docker-context
Apr 1, 2025
40221b7
Merge branch 'next' into test-docker-context
alxndrsn Feb 9, 2026
cfb13b6
ci: remove new workflow
Feb 9, 2026
9e59bcc
unignore client/index.html
Feb 9, 2026
a6a16ac
add additional important files
Feb 9, 2026
e0baab0
Merge branch 'next' into test-docker-context
alxndrsn Feb 12, 2026
a92e62a
Merge branch 'next' into test-docker-context
alxndrsn Feb 12, 2026
ffd459f
remove unnecessary files/folders per review
Feb 12, 2026
db6860a
re-add docs
Feb 12, 2026
f55b0c2
reduce docker image size expectations
Feb 12, 2026
89ca470
remove exception for /test/files
Feb 20, 2026
2445848
Merge branch 'next' into test-docker-context
Feb 20, 2026
ef89f2a
add test of generated version.txt file
Feb 20, 2026
4fa9f0e
lint
Feb 20, 2026
ea3d17a
cheeky indent
Feb 20, 2026
272c5b2
increase expected file count
Feb 20, 2026
4ff3dd8
less indent
Feb 20, 2026
549d9ab
try to break docker contexT?
Feb 20, 2026
b15a101
ci: remove bad ref
Feb 20, 2026
7212663
remove .git dirs
Feb 20, 2026
b8586e8
browserslistrc
Feb 20, 2026
c48dac9
Revert "remove .git dirs"
Feb 20, 2026
bef70ae
lower expectations
Feb 20, 2026
b8aaa65
Merge branch 'next' into test-docker-context
alxndrsn Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
node_modules
npm-debug.log
test
**

# .git directories required for generating version.txt

!/.git/
Comment on lines +3 to +5
Copy link
Copy Markdown
Member

@matthew-white matthew-white Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like we should include .gitignore files as well. Those could conceivably affect what is logged to version.txt (including whether the Git working directory is clean).

Copy link
Copy Markdown
Member

@matthew-white matthew-white Feb 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, now that I say that, if we're no longer copying all files that are committed to the repo, won't version.txt indicate that the working directory isn't clean?

Copy link
Copy Markdown
Contributor Author

@alxndrsn alxndrsn Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great question. I'll investigate. Given the importance of version.txt it would be good to have a test that it's created as expected.

Copy link
Copy Markdown
Contributor Author

@alxndrsn alxndrsn Feb 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think version.txt is affected by changes to the git working tree.

PR at #1660

Copy link
Copy Markdown
Contributor Author

@alxndrsn alxndrsn Feb 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which raises the question: should local changes be reflected in version.txt?

Copy link
Copy Markdown
Member

@matthew-white matthew-white Feb 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think version.txt is affected by changes to the git working tree.

PR at #1660

I know I was the one to approve that PR, but I thought of it more as a general test of version.txt rather than a test of changes to the git working tree. Does test-images.sh make changes to the working tree before generating version.txt? Or is that what #1662 will do?

Which raises the question: should local changes be reflected in version.txt?

I'm not 100% sure that local changes are reflected in version.txt. I think they used to be, but I'm not sure what the current status is. It'd be kind of nice if they were, just because it gives us more information on the build. E.g., if a Sentry report comes in for a version marked -dirty, it could be that the error was due to a user changing the code. I'm not sure it's important enough to block this PR though.

!/files/

!/client/.browserslistrc
!/client/.git
!/client/index.html
!/client/package.json
!/client/package-lock.json
!/client/vite.config.js
!/client/public/
!/client/src/

!/server/.git
!/server/.npmrc
!/server/package.json
!/server/package-lock.json
!/server/pm2.config.js
!/server/config/
!/server/docs/
!/server/lib/
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
fetch-depth: 0
fetch-tags: true
submodules: recursive
- run: ./test/check-docker-context.sh --min-size 50000 --max-size 60000 --min-count 1500 --max-count 1700
- run: ./test/check-docker-context.sh --min-size 40000 --max-size 50000 --min-count 900 --max-count 1000
- run: ./test/test-images.sh
- if: always()
run: docker compose logs