Skip to content

Commit 5a1e343

Browse files
gitEricssongitEricsson
committed
Update: Docker, AWS, Nginx, Gunicorn
1 parent 355c421 commit 5a1e343

File tree

14 files changed

+660
-23
lines changed

14 files changed

+660
-23
lines changed

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
.env
1+
.env
2+
.env.db
3+
.env.prod
24
env
35
env/
46
.venv
@@ -21,4 +23,6 @@ db.sqlite3
2123
/reviews/__pycache__
2224
/Natours_Django/__pycache__
2325
/bookings/__pycache__
24-
.vs/*
26+
.vs/*
27+
/staticfiles
28+
/mediafiles

‎Dockerfile‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
FROM python:3.11.4-slim-buster
2+
3+
# Set work directory
4+
WORKDIR /usr/src/app
5+
6+
# Set environment variables
7+
ENV PYTHONDONTWRITEBYTECODE 1
8+
ENV PYTHONUNBUFFERED 1
9+
10+
# Install system dependencies and GDAL
11+
RUN apt-get update && apt-get install -y netcat \
12+
gcc \
13+
python3-dev \
14+
postgresql-client \
15+
libpq-dev \
16+
gdal-bin \
17+
libgdal-dev \
18+
python3-gdal \
19+
&& rm -rf /var/lib/apt/lists/*
20+
21+
# Set GDAL environment variables
22+
ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
23+
ENV C_INCLUDE_PATH=/usr/include/gdal
24+
25+
# Install Python dependencies
26+
COPY requirements.txt .
27+
RUN pip install --upgrade pip
28+
RUN pip install -r requirements.txt
29+
30+
# Copy project files
31+
COPY . .
32+
33+
# Ensure the dev-data directory has correct permissions
34+
COPY ./dev-data .
35+
RUN chmod +x ./dev-data
36+
37+
# Copy and set entrypoint
38+
COPY ./entrypoint.sh .
39+
RUN sed -i 's/\r$//g' ./entrypoint.sh
40+
RUN chmod +x ./entrypoint.sh
41+
42+
43+
# Run entrypoint script
44+
ENTRYPOINT ["./entrypoint.sh"]

‎Dockerfile.prod‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
# Builder Stage
2+
FROM python:3.11.4-slim-buster AS builder
3+
4+
# Set work directory
5+
WORKDIR /usr/src/app
6+
7+
# Set environment variables
8+
ENV PYTHONDONTWRITEBYTECODE 1
9+
ENV PYTHONUNBUFFERED 1
10+
11+
# Install system dependencies and GDAL
12+
RUN apt-get update && apt-get install -y netcat \
13+
gcc \
14+
python3-dev \
15+
postgresql-client \
16+
libpq-dev \
17+
gdal-bin \
18+
libgdal-dev \
19+
python3-gdal \
20+
&& rm -rf /var/lib/apt/lists/*
21+
22+
# Set GDAL environment variables
23+
ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
24+
ENV C_INCLUDE_PATH=/usr/include/gdal
25+
26+
# Install Python dependencies
27+
COPY requirements.txt .
28+
RUN pip install --upgrade pip
29+
RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels -r requirements.txt
30+
31+
# Final Stage
32+
FROM python:3.11.4-slim-buster
33+
34+
# Create app user
35+
RUN addgroup --system app && adduser --system --group app
36+
37+
# Create app directories
38+
ENV HOME=/home/app
39+
ENV APP_HOME=/home/app/web
40+
RUN mkdir -p $APP_HOME
41+
RUN mkdir $APP_HOME/staticfiles
42+
RUN mkdir $APP_HOME/mediafiles
43+
WORKDIR $APP_HOME
44+
45+
# Install system dependencies
46+
RUN apt-get update && apt-get install -y \
47+
postgresql-client \
48+
gdal-bin \
49+
libgdal-dev \
50+
python3-gdal \
51+
netcat \
52+
&& rm -rf /var/lib/apt/lists/*
53+
54+
# Set GDAL environment variables
55+
ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
56+
ENV C_INCLUDE_PATH=/usr/include/gdal
57+
58+
# Install Python packages
59+
COPY --from=builder /usr/src/app/wheels /wheels
60+
COPY --from=builder /usr/src/app/requirements.txt .
61+
RUN pip install --no-cache-dir --upgrade pip
62+
RUN pip install --no-cache-dir /wheels/*
63+
64+
# Copy project files
65+
COPY . $APP_HOME
66+
67+
# Ensure the dev-data directory has correct permissions
68+
RUN chown -R app:app $APP_HOME/dev-data
69+
70+
# Copy and set entrypoint
71+
COPY ./entrypoint.prod.sh .
72+
RUN sed -i 's/\r$//g' $APP_HOME/entrypoint.prod.sh
73+
RUN chmod +x $APP_HOME/entrypoint.prod.sh
74+
75+
# Set permissions
76+
RUN chown -R app:app $APP_HOME
77+
78+
# Switch to app user
79+
USER app
80+
81+
# Run entrypoint script
82+
ENTRYPOINT ["/home/app/web/entrypoint.prod.sh"]
83+
CMD ["gunicorn", "--bind", "0.0.0.0:8000", "Natours_Django.wsgi:application"]

‎Natours_Django/settings.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
SECRET_KEY = os.environ.get("SECRET_KEY")
3030

3131
# SECURITY WARNING: don't run with debug turned on in production!
32-
DEBUG = True # set as False if you want to custom-handle error 500 and 404
32+
DEBUG = bool(os.environ.get("DEBUG", 1)) # set as False if you want to custom-handle error 500 and 404
3333

34-
ALLOWED_HOSTS = ['localhost', '127.0.0.1']
34+
ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS").split(" ")
3535

3636
AUTH_USER_MODEL = 'users.User'
3737

@@ -133,11 +133,11 @@
133133
DATABASES = {
134134
'default': {
135135
'ENGINE': 'django.contrib.gis.db.backends.postgis',
136-
'NAME': 'Natours_Django',
137-
'USER': 'postgres',
138-
'PASSWORD': os.environ.get("DB_PASSWORD"),
139-
'HOST': 'localhost',
140-
'PORT': '5432',
136+
'NAME': os.environ.get('SQL_DATABASE', 'Natours_Django'),
137+
'USER': os.environ.get('SQL_USER', 'postgres'),
138+
'PASSWORD': os.environ.get('SQL_PASSWORD', ''),
139+
'HOST': os.environ.get('SQL_HOST', 'localhost'),
140+
'PORT': os.environ.get('SQL_PORT', '5432'),
141141
}
142142
}
143143

@@ -176,7 +176,11 @@
176176
# Static files (CSS, JavaScript, Images)
177177
# https://docs.djangoproject.com/en/5.0/howto/static-files/
178178

179-
STATIC_URL = 'static/'
179+
STATIC_URL = '/static/'
180+
STATIC_ROOT = BASE_DIR / "staticfiles"
181+
182+
MEDIA_URL = "/media/"
183+
MEDIA_ROOT = BASE_DIR / "mediafiles"
180184

181185
# Default primary key field type
182186
# https://docs.djangoproject.com/en/5.0/ref/settings/#default-auto-field

‎docker-compose.dev.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
version: '3.8'
2+
3+
services:
4+
web:
5+
build:
6+
context: .
7+
dockerfile: Dockerfile
8+
command: python manage.py runserver 0.0.0.0:8000
9+
volumes:
10+
- .:/home/app/web
11+
ports:
12+
- '8000:8000'
13+
env_file:
14+
- .env
15+
logging:
16+
options:
17+
max-size: '10m'
18+
max-file: '3'
19+
depends_on:
20+
- db
21+
22+
db:
23+
image: postgis/postgis:13-3.1-alpine
24+
volumes:
25+
- postgres_data:/var/lib/postgresql/data/
26+
env_file:
27+
- .env.db
28+
29+
volumes:
30+
postgres_data:

‎docker-compose.prod.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
version: '3.8'
2+
3+
services:
4+
web:
5+
build:
6+
context: .
7+
dockerfile: Dockerfile.prod
8+
command: gunicorn Natours_Django.wsgi:application --bind 0.0.0.0:8000
9+
volumes:
10+
- .:/home/app/web
11+
- static_volume:/home/app/web/staticfiles
12+
- media_volume:/home/app/web/mediafiles
13+
expose:
14+
- 8000
15+
env_file:
16+
- .env
17+
logging:
18+
options:
19+
max-size: '10m'
20+
max-file: '3'
21+
depends_on:
22+
- db
23+
24+
db:
25+
image: postgis/postgis:13-3.1-alpine
26+
volumes:
27+
- postgres_data:/var/lib/postgresql/data/
28+
env_file:
29+
- .env.db
30+
31+
nginx:
32+
image: nginx:alpine
33+
build: ./nginx
34+
volumes:
35+
- static_volume:/home/app/web/staticfiles
36+
- media_volume:/home/app/web/mediafiles
37+
ports:
38+
- '80:80'
39+
depends_on:
40+
- web
41+
42+
volumes:
43+
postgres_data:
44+
static_volume:
45+
media_volume:

‎docker-compose.yml‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
version: '3.8'
2+
3+
services:
4+
web:
5+
build:
6+
context: .
7+
dockerfile: Dockerfile.prod
8+
command: gunicorn Natours_Django.wsgi:application --bind 0.0.0.0:8000
9+
volumes:
10+
- .:/home/app/web
11+
- static_volume:/home/app/web/staticfiles
12+
- media_volume:/home/app/web/mediafiles
13+
expose:
14+
- 8000
15+
env_file:
16+
- .env
17+
logging:
18+
options:
19+
max-size: '10m'
20+
max-file: '3'
21+
depends_on:
22+
- db
23+
24+
db:
25+
image: postgis/postgis:13-3.1-alpine
26+
volumes:
27+
- postgres_data:/var/lib/postgresql/data/
28+
env_file:
29+
- .env.db
30+
31+
nginx:
32+
image: nginx:alpine
33+
build: ./nginx
34+
volumes:
35+
- static_volume:/home/app/web/staticfiles
36+
- media_volume:/home/app/web/mediafiles
37+
ports:
38+
- '80:80'
39+
depends_on:
40+
- web
41+
42+
volumes:
43+
postgres_data:
44+
static_volume:
45+
media_volume:

‎entrypoint.prod.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/sh
2+
3+
if [ "$DATABASE" = "postgres" ]
4+
then
5+
echo "Waiting for postgres..."
6+
7+
while ! nc -z $SQL_HOST $SQL_PORT; do
8+
sleep 0.1
9+
done
10+
11+
echo "PostgreSQL started"
12+
fi
13+
14+
# Collect static files
15+
python manage.py collectstatic --no-input
16+
17+
exec "$@"

‎entrypoint.sh‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/sh
2+
3+
if [ "$DATABASE" = "postgres" ]
4+
then
5+
echo "Waiting for postgres..."
6+
7+
while ! nc -z $SQL_HOST $SQL_PORT; do
8+
sleep 0.1
9+
done
10+
11+
echo "PostgreSQL started"
12+
fi
13+
14+
# Run migrations
15+
python manage.py makemigrations
16+
python manage.py migrate
17+
18+
# Collect static files
19+
python manage.py collectstatic --no-input
20+
21+
# Check if this is first time setup using an environment variable
22+
if [ "$DJANGO_INITIALIZE_DATA" = "true" ]
23+
then
24+
echo "First time setup detected. Loading initial data..."
25+
26+
# Check if data directory exists
27+
if [ -d "dev-data/data" ]; then
28+
# Delete existing data first (optional, comment out if not needed)
29+
# python dev-data/data/data_loader.py --delete
30+
31+
# Import fresh data
32+
# python dev-data/data/data_loader.py --import
33+
34+
# Import appointments
35+
# python dev-data/data/data_loader.py --importDates
36+
37+
echo "Initial data load completed"
38+
else
39+
echo "Warning: dev-data directory not found. Skipping initial data load."
40+
fi
41+
fi
42+
43+
exec "$@"

‎nginx/Dockerfile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
FROM nginx:1.25
2+
3+
RUN rm /etc/nginx/conf.d/default.conf
4+
COPY nginx.conf /etc/nginx/conf.d/

0 commit comments

Comments
 (0)