Merge pull request devopshobbies#55 from AliMehraji/main

Update: Reduce Layers in dockerfile in Django

07-Python/python-django/Django

@@ -10,10 +10,10 @@ WORKDIR /app
 COPY . /app
 
 # Installing requirements
-ADD requirements/req.txt /app
-RUN pip3 install --upgrade pip
-RUN pip3 install -r req.txt
-RUN pip3 install django gunicorn
+COPY requirements/req.txt /app
+RUN pip3 install --no-cache-dir pip && \
+    pip3 install -r req.txt && \ 
+    pip3 install django gunicorn
 
 
 # Collect static files

07-Python/python-with-postgresql/README.md

@@ -1,12 +1,12 @@
 # Python With PostgreSQL
 
 ## Introduction
-This dockercompose file creates a python application server alongside a PostgreSQL server and pgadmin server as database management tool
+This docker-compose file creates a python application server alongside a PostgreSQL server and pgadmin server as database management tool
 
 ## How to use
-You can simply use project folder as your project main folder and this docker file updates Python project and run your new code everytime you restart python container
+You can simply use project folder as your project main folder and this docker file updates Python project and run your new code every time you restart python container
 
 ## Required information
-You can access to postgreSQL username and password inside dockercompose.yaml file.
+You can access to postgreSQL username and password inside docker-compose.yaml file.
 
 Enjoy!

13-FastApi/README.md

@@ -1,45 +1,48 @@
 ![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=for-the-badge&logo=docker&logoColor=white)
 ![FastAPI](https://img.shields.io/badge/FastAPI-005571?style=for-the-badge&logo=fastapi)
-# Learning Dockerfile for Beginners
+
+# Dockerfile for Beginners
 
 This project contains a simple and practical example of a Dockerfile to help beginners learn how to use Docker.
 
 ## Prerequisites
 
-- Docker installed on your system
-- Basic knowledge of the Linux command line
+- Docker installed on your OS. [Docker Installation](https://docs.docker.com/engine/install/)
+- Basic knowledge of the Linux command line.
 
-## Here's what each line does
+## Each Line Explanation in Dockerfile
 
 - ``FROM tiangolo/uvicorn-gunicorn-fastapi:python3.9-slim``: Use the official fastapi image as our base image. We're using the slim version to keep the image small.
 
-- ``WORKDIR /app``: Set the working directory in the container to /app.
-
-- ``COPY requirements.txt .``: Copy the requierments file from the current directory to the container.
+- ``WORKDIR /app``: Set the working directory in the container to `/app`.
 
+- ``COPY requirements.txt .``: Copy the `requirements.txt` file from the current directory to the container which is `/app` directory, because in the previous step we have used `WORKDIR` this directive makes `/app` directory and goes in it.
+
 - ``RUN pip install --no-cache-dir -r requirements.txt``: Install the project dependencies using pip.
 
-- ``COPY main.py .``: Copy the rest of the application code to the container.
+- ``COPY main.py .``: Copy the rest of the application code to the container which is `/app`
 
 - ``CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "80"]``: Set the command to start the application.
 
 ## Usage
 
 1. Clone the repository:
 
-```sh
-git clone https://github.com/devopshobbies/docker-templates.git
-```
+    ```sh
+    git clone https://github.com/devopshobbies/docker-templates.git
+    ```
 
 2. Build the Docker image:
 
-```sh
-cd docker-templates/12-FastApi
-docker build -t hello-fastapi .
-```
+    ```sh
+    cd docker-templates/13-FastApi
+    docker build -t hello-fastapi .
+    ```
 
 3. Run the Docker container:
 
-```sh
-docker container run -d hello-fastapi -p 80:80 
-```
+    ```sh
+    docker container run --detach --publish 80:80 hello-fastapi
+    ```
+   > -d,--detach &emsp;&emsp;&emsp;&emsp; Run container in background and print container ID </br>
+   > -p, --publish list &emsp;&emsp; Publish a container's port(s) to the host

nginx/Dockerfile

@@ -1,4 +1,5 @@
 FROM nginx:1.23
+
 LABEL MAINTAINER="AMIRAJOODANI | https://nextsysadmin.ir"
 
 COPY nginx.conf /etc/nginx/conf.d/default.conf

nginx/nginx.conf

@@ -5,20 +5,20 @@ upstream app {
 
 server {
     listen 80;
+    server_name localhost;
+    charset     utf-8;
 
     access_log /var/log/nginx/access.log;
     error_log /var/log/nginx/error.log;
 
-	root /usr/share/nginx/html;
-	index index.html index.htm;
+	  root /usr/share/nginx/html;
+	  index index.html index.htm;
 
     location / {
-        # proxy the request to the upstream
-	    proxy_pass      http://app;
+	      proxy_pass      http://app;
         proxy_redirect  off;
         proxy_set_header   Host $host;
-	}
-
+	   }
 
     location /app/static/ {
         alias /logapp/static/;