Skip to content

Commit

Permalink
Refactor gitignore and dockerignore and rename Docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
okeneo committed Mar 10, 2024
1 parent b383829 commit 11f997e
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 36 deletions.
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,17 @@ TODO.md

# Redis
dump.rdb

# React files:

# dependencies
node_modules
.pnp
.pnp.js

# testing
coverage

npm-debug.log*
yarn-debug.log*
yarn-error.log*
18 changes: 9 additions & 9 deletions .dockerignore → backend/.dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Byte-compiled / optimized / DLL files
__pycache__/
**__pycache__/
*.py[cod]
*$py.class

Expand Down Expand Up @@ -58,8 +58,8 @@ cover/
# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal
**db.sqlite3
**db.sqlite3-journal

# Flask stuff:
instance/
Expand Down Expand Up @@ -120,8 +120,8 @@ celerybeat.pid
*.sage.py

# Environments
.env*
.venv
**.env*
**.venv
env/
venv/
ENV/
Expand Down Expand Up @@ -160,11 +160,11 @@ cython_debug/
#.idea/

# mac
.DS_store
**.DS_store

# Redis
dump.rdb
**dump.rdb

# Git
.git
.gitignore
**.git
**.gitignore
5 changes: 3 additions & 2 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
build:
context: ./backend
dockerfile: Dockerfile
image: backend-api:1.0
image: personalnest-api:1.0
expose:
- "8000"
entrypoint: ./entrypoint-api.sh
Expand All @@ -19,7 +19,7 @@ services:
build:
context: ./backend
dockerfile: Dockerfile
image: backend-celery:1.0
image: personalnest-celery:1.0
entrypoint: ./entrypoint-celery.sh
environment:
- CELERY_BROKER=redis://redis:6379/0
Expand Down Expand Up @@ -58,6 +58,7 @@ services:
build:
context: ./frontend
dockerfile: Dockerfile
image: personalnest-frontend:1.0
volumes:
- frontend_build:/frontend/build

Expand Down
5 changes: 3 additions & 2 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
build:
context: ./backend
dockerfile: Dockerfile
image: backend-api:1.0
image: personalnest-api:1.0
expose:
- "8000"
entrypoint: ./entrypoint-api.sh
Expand All @@ -19,7 +19,7 @@ services:
build:
context: ./backend
dockerfile: Dockerfile
image: backend-celery:1.0
image: personalnest-celery:1.0
entrypoint: ./entrypoint-celery.sh
environment:
- CELERY_BROKER=redis://redis:6379/0
Expand Down Expand Up @@ -75,6 +75,7 @@ services:
build:
context: ./frontend
dockerfile: Dockerfile
image: personalnest-frontend:1.0
volumes:
- frontend_build:/frontend/build

Expand Down
26 changes: 26 additions & 0 deletions frontend/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# dependencies
node_modules
.pnp
.pnp.js

# testing
coverage
.coverage
.coverage.*

npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Git
**.git
**.gitignore

# Distribution / packaging
**dist/

# Environments
**.env*

# mac
**.DS_store
23 changes: 0 additions & 23 deletions frontend/.gitignore

This file was deleted.

0 comments on commit 11f997e

Please sign in to comment.