From 11f997e6690b062f14ffe091f7dc508429b1eb88 Mon Sep 17 00:00:00 2001
From: Oghenetega Okene <okenetega@gmail.com>
Date: Sun, 10 Mar 2024 18:08:06 -0500
Subject: [PATCH] Refactor gitignore and dockerignore and rename Docker images

---
 .gitignore                             | 14 ++++++++++++++
 .dockerignore => backend/.dockerignore | 18 +++++++++---------
 docker-compose.dev.yml                 |  5 +++--
 docker-compose.prod.yml                |  5 +++--
 frontend/.dockerignore                 | 26 ++++++++++++++++++++++++++
 frontend/.gitignore                    | 23 -----------------------
 6 files changed, 55 insertions(+), 36 deletions(-)
 rename .dockerignore => backend/.dockerignore (96%)
 create mode 100644 frontend/.dockerignore
 delete mode 100644 frontend/.gitignore

diff --git a/.gitignore b/.gitignore
index a1f44eb..9f76d22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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*
diff --git a/.dockerignore b/backend/.dockerignore
similarity index 96%
rename from .dockerignore
rename to backend/.dockerignore
index 13a78dd..49ac8f6 100644
--- a/.dockerignore
+++ b/backend/.dockerignore
@@ -1,5 +1,5 @@
 # Byte-compiled / optimized / DLL files
-__pycache__/
+**__pycache__/
 *.py[cod]
 *$py.class
 
@@ -58,8 +58,8 @@ cover/
 # Django stuff:
 *.log
 local_settings.py
-db.sqlite3
-db.sqlite3-journal
+**db.sqlite3
+**db.sqlite3-journal
 
 # Flask stuff:
 instance/
@@ -120,8 +120,8 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env*
-.venv
+**.env*
+**.venv
 env/
 venv/
 ENV/
@@ -160,11 +160,11 @@ cython_debug/
 #.idea/
 
 # mac
-.DS_store
+**.DS_store
 
 # Redis
-dump.rdb
+**dump.rdb
 
 # Git
-.git
-.gitignore
+**.git
+**.gitignore
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index e0d7856..c19fd92 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -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
@@ -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
@@ -58,6 +58,7 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile
+    image: personalnest-frontend:1.0
     volumes:
       - frontend_build:/frontend/build
 
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index a460919..f7b5cde 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -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
@@ -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
@@ -75,6 +75,7 @@ services:
     build:
       context: ./frontend
       dockerfile: Dockerfile
+    image: personalnest-frontend:1.0
     volumes:
       - frontend_build:/frontend/build
 
diff --git a/frontend/.dockerignore b/frontend/.dockerignore
new file mode 100644
index 0000000..942b0c0
--- /dev/null
+++ b/frontend/.dockerignore
@@ -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
diff --git a/frontend/.gitignore b/frontend/.gitignore
deleted file mode 100644
index 4d29575..0000000
--- a/frontend/.gitignore
+++ /dev/null
@@ -1,23 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*