Change deploy settings of the playground app

.deploy/.env.local

@@ -0,0 +1 @@
+DOCKERFILE=Dockerfile

.deploy/.env.production

@@ -0,0 +1 @@
+DOCKERFILE=Dockerfile.deploy

.deploy/quill.conf

@@ -0,0 +1,22 @@
+server {
+ listen 80;
+ server_name quill.localhost quill.lhy.kr;
+
+ location / {
+ proxy_set_header REMOTE_ADDR $remote_addr;
+ proxy_set_header Host $http_host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-Proto https;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+ proxy_pass_header Server;
+ proxy_pass http://django:8000;
+ proxy_redirect off;
+ }
+ location /static/ {
+ alias /srv/playground/.static/;
+ }
+ location /favicon.ico {
+ alias /srv/playground/.static/favicon.ico;
+ }
+}

Dockerfile

@@ -1,14 +1,9 @@
 # syntax = docker/dockerfile:experimental
-FROM python:3.9-slim
+FROM python:3.10-alpine
 
 # Language, Timezone
 ENV LANG C.UTF-8
 
-RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
- apt -y update &&\
- apt -y dist-upgrade &&\
- apt -y autoremove
-
 # requirements
 COPY requirements.txt /tmp/requirements.txt
 RUN --mount=type=cache,target=/root/.cache/pip \
@@ -22,4 +17,4 @@ COPY . /srv/
 WORKDIR /srv/playground
 
 EXPOSE 8000
-CMD python manage.py shell_plus --ipython
+CMD python manage.py shell_plus

Dockerfile.deploy

@@ -1,14 +1,9 @@
 # syntax = docker/dockerfile:experimental
-FROM python:3.9-slim
+FROM python:3.10-alpine
 
 # Language, Timezone
 ENV LANG C.UTF-8
 
-RUN \
- apt -y update &&\
- apt -y dist-upgrade &&\
- apt -y autoremove
-
 # requirements
 COPY requirements.txt /tmp/requirements.txt
 RUN \
@@ -22,4 +17,4 @@ COPY . /srv/
 WORKDIR /srv/playground
 
 EXPOSE 8000
-CMD python manage.py shell_plus --ipython
+CMD python manage.py shell_plus

README.md

@@ -169,9 +169,12 @@ python -m http.server 3001
 
  
 
-### docker-compose up (in local)
+### docker-compose up
 
 ```shell
-docker-compose -f docker-compose-local.yml up --build --force-recreate --remove-orphans
+# local
+docker-compose --env-file .deploy/.env.local up --build --force-recreate --remove-orphans
+# production
+docker-compose --env-file .deploy/.env.production up --build --force-recreate --remove-orphans
 ```
 

docker-compose.yml

@@ -3,37 +3,20 @@ version: '3'
 services:
  quill:
  image: nginx:alpine
- restart: unless-stopped
  volumes:
- - ./.deploy/nginx/nginx.conf:/etc/nginx/nginx.conf
- - ./.deploy/nginx/production.nginx:/etc/nginx/conf.d/default.conf
- - ./.deploy/certbot/conf:/etc/letsencrypt
- - ./.deploy/certbot/www:/var/www/certbot
+ - .deploy/quill.conf:/etc/nginx/conf.d/default.conf
  - static:/srv/playground/.static
- depends_on:
- - django
- command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
  networks:
  - default
  - proxy
 
- certbot:
- image: certbot/certbot
- restart: unless-stopped
- volumes:
- - /etc/letsencrypt:/etc/letsencrypt
- - /var/www/certbot:/var/www/certbot
- entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
- networks:
- - default
-
  django:
  build:
  context: .
- dockerfile: Dockerfile.deploy
+ dockerfile: ${DOCKERFILE}
  volumes:
  - static:/srv/playground/.static
- command: bash -c '
+ command: sh -c '
  python manage.py collectstatic --noinput &&
  python manage.py migrate --noinput &&
  gunicorn -c /srv/.deploy/gunicorn.py config.wsgi'

playground/config/settings.py

@@ -15,6 +15,7 @@
 ALLOWED_HOSTS = [
  "localhost",
  "127.0.0.1",
+ "quill.localhost",
  "quill.lhy.kr",
 ]
 

playground/posts/models.py

@@ -22,4 +22,4 @@ def get_absolute_url(self):
 
 class NonQuillPost(models.Model):
  content_char = CharField(max_length=300, blank=True)
- content_text = QuillField()
+ content_text = TextField(blank=True)

pyproject.toml

@@ -8,7 +8,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = "^3.10"
 Django = "^3.2.9"
 django-extensions = "^3.1.5"
 djangorestframework = "^3.13.1"