Step19: dockerize

yangxg · yangxg · commit 2ba9ab96e37c · 2019-10-14T22:29:12.000+08:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,4 @@
+.*
+_credentials.py
+fabfile.py
+*.sqlite3
diff --git a/.gitignore b/.gitignore
@@ -106,6 +106,7 @@ venv.bak/
 *.sqlite3
 media/
 _credentials.py
+.production
 
 # Pycharm .idea folder, see following link to know which files should be ignored:
 # https://www.jetbrains.com/help/pycharm/synchronizing-and-sharing-settings.html#7e81d3cb
diff --git a/.idea/HelloDjango-blog-tutorial.iml b/.idea/HelloDjango-blog-tutorial.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/Pipfile b/Pipfile
@@ -1,6 +1,6 @@
 [[source]]
 name = "pypi"
-url = "https://pypi.org/simple"
+url = "https://pypi.douban.com/simple"
 verify_ssl = true
 
 [dev-packages]
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/README.md b/README.md
@@ -86,7 +86,36 @@ tutorial 分支为项目的主分支，每一篇教程的代码都和历史提
 
 ### Docker
 
-即将奉上！敬请期待~
+1. **安装 Docker 和 Docker Compose**
+
+2. **克隆项目到本地**
+
+   ```
+   git clone https://github.com/HelloGitHub-Team/HelloDjango-blog-tutorial.git
+   ```
+
+3. **构建镜像和启动容器**
+
+   ```
+   docker-compose -f local.yml build
+   docker-compose -f local.yml up
+   ```
+
+4. **创建后台管理员账户**
+
+   ```
+   docker exec -it hellodjango_blog_tutorial_local python manage.py createsuperuser
+   ```
+
+   其中 hellodjango_blog_tutorial_local 为项目预定义容器名
+
+5. 进入后台发布文章
+
+   在浏览器访问：http://127.0.0.1:8000/admin
+
+   使用第 3 步创建的后台管理员账户登录
+
+   具体请参阅 [创作后台开启，请开始你的表演](https://www.zmrenwu.com/courses/hellodjango-blog-tutorial/materials/65/)。
 
 ## 教程目录索引
 
@@ -110,6 +139,7 @@ tutorial 分支为项目的主分支，每一篇教程的代码都和历史提
 16. [Nginx+Gunicorn+Supervisor 部署 Django 博客应用](https://www.zmrenwu.com/courses/hellodjango-blog-tutorial/materials/74/)
 17. [使用 Fabric 自动化部署](https://www.zmrenwu.com/courses/hellodjango-blog-tutorial/materials/75/)
 18. [使用 Certbot 向 Let's Encrypt 免费申请 HTTPS 证书](https://www.zmrenwu.com/courses/hellodjango-blog-tutorial/materials/76/)
+19. [使用 Docker 让部署 Django 项目更加轻松](https://www.zmrenwu.com/courses/hellodjango-blog-tutorial/materials/77/)
 
 ## 公众号
 <p align="center">
diff --git a/blogproject/settings/common.py b/blogproject/settings/common.py
@@ -70,7 +70,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'NAME': os.path.join(BASE_DIR, 'database', 'db.sqlite3'),
     }
 }
 
diff --git a/compose/local/Dockerfile b/compose/local/Dockerfile
@@ -0,0 +1,22 @@
+FROM python:3.6-alpine
+
+ENV PYTHONUNBUFFERED 1
+
+# 替换为国内源
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+RUN apk update \
+  # Pillow dependencies
+  && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev
+
+WORKDIR /app
+
+RUN pip install pipenv -i https://pypi.douban.com/simple
+
+COPY Pipfile /app/Pipfile
+COPY Pipfile.lock /app/Pipfile.lock
+RUN pipenv install --system --deploy --ignore-pipfile
+
+COPY ./compose/local/start.sh /start.sh
+RUN sed -i 's/\r//' /start.sh
+RUN chmod +x /start.sh
diff --git a/compose/local/start.sh b/compose/local/start.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+python manage.py migrate
+python manage.py runserver 0.0.0.0:8000
diff --git a/compose/production/django/Dockerfile b/compose/production/django/Dockerfile
@@ -0,0 +1,24 @@
+FROM python:3.6-alpine
+
+ENV PYTHONUNBUFFERED 1
+
+# 替换为国内源
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
+
+RUN apk update \
+  # Pillow dependencies
+  && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev
+
+WORKDIR /app
+
+RUN pip install pipenv -i https://pypi.douban.com/simple
+
+COPY Pipfile /app/Pipfile
+COPY Pipfile.lock /app/Pipfile.lock
+RUN pipenv install --system --deploy --ignore-pipfile
+
+COPY . /app
+
+COPY ./compose/production/django/start.sh /start.sh
+RUN sed -i 's/\r//' /start.sh
+RUN chmod +x /start.sh
diff --git a/compose/production/django/start.sh b/compose/production/django/start.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+python manage.py migrate
+python manage.py collectstatic --noinput
+gunicorn blogproject.wsgi:application -w 4 -k gthread -b 0.0.0.0:8000 --chdir=/app
diff --git a/compose/production/nginx/Dockerfile b/compose/production/nginx/Dockerfile
@@ -0,0 +1,12 @@
+FROM nginx:1.17.1
+
+# 替换为国内源
+RUN mv /etc/apt/sources.list /etc/apt/sources.list.bak
+COPY ./compose/production/nginx/sources.list /etc/apt/
+RUN apt-get update && apt-get install -y --allow-unauthenticated certbot python-certbot-nginx
+
+RUN rm /etc/nginx/conf.d/default.conf
+COPY ./compose/production/nginx/hellodjango-blog-tutorial.conf /etc/nginx/conf.d/hellodjango-blog-tutorial.conf
+
+
+
diff --git a/compose/production/nginx/hellodjango-blog-tutorial.conf b/compose/production/nginx/hellodjango-blog-tutorial.conf
@@ -0,0 +1,22 @@
+upstream hellodjango_blog_tutorial  {
+    server hellodjango_blog_tutorial:8000;
+}
+
+server {
+    server_name  hellodjango-blog-tutorial-demo.zmrenwu.com;
+
+    location /static {
+        alias /apps/hellodjango_blog_tutorial/static;
+    }
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+
+        proxy_pass http://hellodjango_blog_tutorial;
+    }
+
+    listen 80;
+}
diff --git a/compose/production/nginx/sources.list b/compose/production/nginx/sources.list
@@ -0,0 +1,30 @@
+deb-src http://archive.ubuntu.com/ubuntu xenial main restricted #Added by software-properties
+deb http://mirrors.aliyun.com/ubuntu/ xenial main restricted
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial main restricted multiverse universe #Added by software-properties
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial-updates main restricted multiverse universe #Added by software-properties
+deb http://mirrors.aliyun.com/ubuntu/ xenial universe
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates universe
+deb http://mirrors.aliyun.com/ubuntu/ xenial multiverse
+deb http://mirrors.aliyun.com/ubuntu/ xenial-updates multiverse
+deb http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial-backports main restricted universe multiverse #Added by software-properties
+deb http://archive.canonical.com/ubuntu xenial partner
+deb-src http://archive.canonical.com/ubuntu xenial partner
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted
+deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted multiverse universe #Added by software-properties
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe
+deb http://mirrors.aliyun.com/ubuntu/ xenial-security multiverse
+
+deb http://mirrors.tencentyun.com/debian/ jessie main non-free contrib
+deb http://mirrors.tencentyun.com/debian/ jessie-updates main non-free contrib
+deb http://mirrors.tencentyun.com/debian/ jessie-backports main non-free contrib
+deb-src http://mirrors.tencentyun.com/debian/ jessie main non-free contrib
+deb-src http://mirrors.tencentyun.com/debian/ jessie-updates main non-free contrib
+deb-src http://mirrors.tencentyun.com/debian/ jessie-backports main non-free contrib
+deb http://mirrors.tencentyun.com/debian-security/ jessie/updates main non-free contrib
+deb-src http://mirrors.tencentyun.com/debian-security/ jessie/updates main non-free contrib
+
+deb http://deb.debian.org/debian stretch main
+deb http://security.debian.org/debian-security stretch/updates main
+deb http://deb.debian.org/debian stretch-updates main
diff --git a/fabfile.py b/fabfile.py
@@ -37,12 +37,6 @@ def deploy(c):
         responders = _get_github_auth_responders()
         c.run(cmd, watchers=responders)
 
-    # 安装依赖，迁移数据库，收集静态文件
-    with c.cd(project_root_path):
-        c.run('~/.local/bin/pipenv install --deploy --ignore-pipfile')
-        c.run('~/.local/bin/pipenv run python manage.py migrate')
-        c.run('~/.local/bin/pipenv run python manage.py collectstatic --noinput')
-
     # 重新启动应用
     with c.cd(supervisor_conf_path):
         cmd = 'supervisorctl start {}'.format(supervisor_program_name)
diff --git a/local.yml b/local.yml
@@ -0,0 +1,19 @@
+version: '3'
+
+volumes:
+  database_local:
+
+services:
+  hellodjango_blog_tutorial_local:
+    build:
+      context: .
+      dockerfile: ./compose/local/Dockerfile
+    image: hellodjango_blog_tutorial_local
+    container_name: hellodjango_blog_tutorial_local
+    working_dir: /app
+    volumes:
+      - database_local:/app/database
+      - .:/app
+    ports:
+      - "8000:8000"
+    command: /start.sh
diff --git a/production.yml b/production.yml
@@ -0,0 +1,34 @@
+version: '3'
+
+volumes:
+  static:
+  database:
+
+services:
+  hellodjango_blog_tutorial:
+    build:
+      context: .
+      dockerfile: compose/production/django/Dockerfile
+    image: hellodjango_blog_tutorial
+    container_name: hellodjango_blog_tutorial
+    working_dir: /app
+    volumes:
+      - database:/app/database
+      - static:/app/static
+    env_file:
+      - .envs/.production
+    ports:
+      - "8000:8000"
+    command: /start.sh
+
+  nginx:
+    build:
+      context: .
+      dockerfile: compose/production/nginx/Dockerfile
+    image: hellodjango_blog_tutorial_nginx
+    container_name: hellodjango_blog_tutorial_nginx
+    volumes:
+      - static:/apps/hellodjango_blog_tutorial/static
+    ports:
+      - "80:80"
+      - "443:443"

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@`
`70`	`70`	`DATABASES = {`
`71`	`71`	`'default': {`
`72`	`72`	`'ENGINE': 'django.db.backends.sqlite3',`
`73`		`- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),`
	`73`	`+ 'NAME': os.path.join(BASE_DIR, 'database', 'db.sqlite3'),`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`