Skip to content

Commit 8c2e1a6

Browse files
Merge pull request #20 from rendiffdev/fix-merge-conflicts
Fix merge conflicts in Docker configurations
2 parents 7cb9595 + 1502a55 commit 8c2e1a6

File tree

6 files changed

+2442
-82
lines changed

6 files changed

+2442
-82
lines changed

.dockerignore

Lines changed: 281 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,281 @@
1+
# Git and version control
2+
.git
3+
.gitignore
4+
.gitattributes
5+
.github
6+
7+
# Documentation
8+
*.md
9+
docs/
10+
*.txt
11+
LICENSE
12+
13+
# Development files
14+
.vscode/
15+
.idea/
16+
*.swp
17+
*.swo
18+
*~
19+
20+
# Python cache and build
21+
__pycache__/
22+
*.py[cod]
23+
*$py.class
24+
*.so
25+
.Python
26+
build/
27+
develop-eggs/
28+
dist/
29+
downloads/
30+
eggs/
31+
.eggs/
32+
lib/
33+
lib64/
34+
parts/
35+
sdist/
36+
var/
37+
wheels/
38+
share/python-wheels/
39+
*.egg-info/
40+
.installed.cfg
41+
*.egg
42+
MANIFEST
43+
44+
# Virtual environments
45+
venv/
46+
env/
47+
ENV/
48+
.env
49+
.venv
50+
51+
# Testing
52+
.tox/
53+
.nox/
54+
.coverage
55+
.pytest_cache/
56+
cover/
57+
.hypothesis/
58+
htmlcov/
59+
.cache
60+
nosetests.xml
61+
coverage.xml
62+
*.cover
63+
*.py,cover
64+
.nyc_output
65+
66+
# Jupyter Notebook
67+
.ipynb_checkpoints
68+
69+
# IPython
70+
profile_default/
71+
ipython_config.py
72+
73+
# PyCharm
74+
.idea/
75+
76+
# mypy
77+
.mypy_cache/
78+
.dmypy.json
79+
dmypy.json
80+
81+
# Pyre type checker
82+
.pyre/
83+
84+
# pytype static type analyzer
85+
.pytype/
86+
87+
# Cython debug symbols
88+
cython_debug/
89+
90+
# Local development files
91+
.env.local
92+
.env.development.local
93+
.env.test.local
94+
.env.production.local
95+
96+
# OS generated files
97+
.DS_Store
98+
.DS_Store?
99+
._*
100+
.Spotlight-V100
101+
.Trashes
102+
ehthumbs.db
103+
Thumbs.db
104+
105+
# Logs
106+
logs/
107+
*.log
108+
npm-debug.log*
109+
yarn-debug.log*
110+
yarn-error.log*
111+
112+
# Runtime data
113+
pids/
114+
*.pid
115+
*.seed
116+
*.pid.lock
117+
118+
# Coverage directory used by tools like istanbul
119+
coverage/
120+
121+
# Dependency directories
122+
node_modules/
123+
124+
# Optional npm cache directory
125+
.npm
126+
127+
# Storage and data directories (only for build context)
128+
storage/
129+
data/
130+
tmp/
131+
temp/
132+
models/
133+
134+
# SSL certificates and keys
135+
*.pem
136+
*.key
137+
*.crt
138+
*.csr
139+
ssl/
140+
certs/
141+
142+
# Monitoring and logs
143+
monitoring/data/
144+
prometheus/data/
145+
grafana/data/
146+
147+
# Database files
148+
*.db
149+
*.sqlite
150+
*.sqlite3
151+
152+
# Backup files
153+
*.bak
154+
*.backup
155+
156+
# Archive files
157+
*.tar
158+
*.zip
159+
*.gz
160+
*.rar
161+
*.7z
162+
163+
# Large media files (should be mounted as volumes)
164+
*.mp4
165+
*.avi
166+
*.mov
167+
*.mkv
168+
*.wmv
169+
*.flv
170+
*.webm
171+
*.mp3
172+
*.wav
173+
*.flac
174+
*.aac
175+
*.ogg
176+
*.m4a
177+
178+
# Terraform
179+
*.tfstate
180+
*.tfstate.*
181+
.terraform/
182+
.terraform.lock.hcl
183+
184+
# Kubernetes
185+
*.yaml.bak
186+
kustomization.yaml
187+
188+
# Helm
189+
charts/*/charts/
190+
charts/*/requirements.lock
191+
192+
# Local configuration overrides
193+
docker-compose.override.yml
194+
docker-compose.local.yml
195+
196+
# CI/CD files (not needed in container)
197+
.travis.yml
198+
.circleci/
199+
.gitlab-ci.yml
200+
Jenkinsfile
201+
202+
# Security files
203+
.secrets
204+
secrets/
205+
*.key
206+
api-keys.json
207+
208+
# Performance profiling
209+
*.prof
210+
*.pprof
211+
212+
# IDE files
213+
*.sublime-project
214+
*.sublime-workspace
215+
216+
# Temporary files
217+
.tmp/
218+
tmp/
219+
temp/
220+
221+
# Node.js specific (if any frontend components)
222+
package-lock.json
223+
yarn.lock
224+
225+
# Python specific
226+
Pipfile
227+
Pipfile.lock
228+
poetry.lock
229+
pyproject.toml
230+
231+
# FastAPI specific
232+
.pytest_cache/
233+
.coverage
234+
htmlcov/
235+
236+
# Alembic (database migrations) - exclude data
237+
alembic/versions/*.pyc
238+
239+
# Config files with sensitive data
240+
config/production/
241+
config/local/
242+
.env.production
243+
244+
# Development tools
245+
docker-compose.dev.yml
246+
docker-compose.test.yml
247+
248+
# AI model files (large files should be downloaded at runtime)
249+
*.onnx
250+
*.pt
251+
*.pth
252+
*.h5
253+
*.pb
254+
255+
# FFmpeg specific
256+
*.ffprobe
257+
*.ffmpeg
258+
259+
# Temporary processing files
260+
processing/
261+
output/
262+
input/
263+
uploads/
264+
265+
# Documentation build
266+
site/
267+
_build/
268+
.readthedocs.yml
269+
270+
# Linting and formatting
271+
.flake8
272+
.black
273+
.isort.cfg
274+
setup.cfg
275+
tox.ini
276+
277+
# Shell scripts that shouldn't be in container
278+
scripts/setup.sh
279+
scripts/install.sh
280+
install.sh
281+
setup.sh

0 commit comments

Comments
 (0)