From 571c0c29283400b89adca849a074a97411477035 Mon Sep 17 00:00:00 2001 From: willzhang Date: Wed, 3 Mar 2021 17:52:29 +0800 Subject: [PATCH 1/5] udpate --- docker/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ docker/default.conf | 18 ++++++++++++++++++ docker/entrypoint.sh | 19 +++++++++++++++++++ 3 files changed, 72 insertions(+) create mode 100644 docker/Dockerfile create mode 100644 docker/default.conf create mode 100644 docker/entrypoint.sh diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 00000000..f4d29884 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,35 @@ +FROM python:3.6.10-alpine3.11 as builder + +RUN apk update && apk add --no-cache git build-base mariadb-connector-c-dev +RUN apk add --no-cache --virtual .build-deps openssl-dev gcc musl-dev python3-dev libffi-dev jpeg-dev make mariadb-dev \ + && mkdir /etc/supervisor.d + +RUN git clone https://github.com/stacklens/django_blog_tutorial.git --depth=1 /blog && cd /blog && git pull && rm -rf /blog/db.sqlite3 + +RUN pip install --upgrade pip \ + && pip install wheel \ + && pip wheel -r /blog/requirements.txt --wheel-dir=/pippacks/wheels \ + && pip wheel gunicorn bootstrap4 --wheel-dir=/pippacks/wheels \ + && apk del .build-deps + + +FROM python:3.6.10-alpine3.11 + +RUN apk update \ + && apk add --no-cache nginx bash git libjpeg + +COPY --from=builder /pippacks /pippacks +COPY --from=builder /blog /blog + +WORKDIR /blog/ + +RUN pip install --no-index --find-links=/pippacks/wheels -r requirements.txt \ + && pip install gunicorn bootstrap4 --no-index --find-links=/pippacks/wheels \ + && rm -rf /pippacks + +ADD default.conf /etc/nginx/conf.d/default.conf +ADD entrypoint.sh /entrypoint.sh + +RUN chmod +x /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker/default.conf b/docker/default.conf new file mode 100644 index 00000000..d8c26a58 --- /dev/null +++ b/docker/default.conf @@ -0,0 +1,18 @@ +server { + charset utf-8; + listen 80; + server_name _; # 改成你的 IP + + location /static { + alias /blog/collected_static; + } + + location /media { + alias /blog/media; + } + + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:8000; + } +} diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh new file mode 100644 index 00000000..7683a439 --- /dev/null +++ b/docker/entrypoint.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +# init nginx +if [ ! -d /run/nginx ]; then + mkdir -p /run/nginx + chown -R nginx.nginx /run/nginx +fi + +# init blog +if [ ! -f /blog/db.sqlite3 ]; then + python manage.py collectstatic + python manage.py makemigrations + python manage.py migrate +fi + +nginx +gunicorn --workers=2 --bind=0.0.0.0:8000 my_blog.wsgi:application From 596c34a19672c143812ac801c0205c19b955fcfc Mon Sep 17 00:00:00 2001 From: will Date: Wed, 3 Mar 2021 17:54:13 +0800 Subject: [PATCH 2/5] Create README.md --- docker/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 docker/README.md diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 00000000..337ee9c9 --- /dev/null +++ b/docker/README.md @@ -0,0 +1,8 @@ +## django-blog with docker + + +``` +docker run -d --restart=always --name=blog \ + -p 8088:80 \ + willdockerhub/django-blog +``` From b808f9a7bf1dcc32dba3111cd667acfcd4e458ba Mon Sep 17 00:00:00 2001 From: will Date: Wed, 3 Mar 2021 18:29:39 +0800 Subject: [PATCH 3/5] Update README.md --- docker/README.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/docker/README.md b/docker/README.md index 337ee9c9..ddcb82f2 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,8 +1,23 @@ -## django-blog with docker +# django-blog with docker +## quict start -``` +run with docker + +```shell docker run -d --restart=always --name=blog \ -p 8088:80 \ willdockerhub/django-blog ``` + +create superuer + +```shell +docker exec -it blog python manage.py createsuperuser --username admin +``` + + +accee browers +``` +http://192.168.1.1:8088 +``` From 8f9ce43ab87239c17af96d85b258957cee8481b3 Mon Sep 17 00:00:00 2001 From: will Date: Wed, 3 Mar 2021 18:32:43 +0800 Subject: [PATCH 4/5] Update README.md --- docker/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker/README.md b/docker/README.md index ddcb82f2..98e8803a 100644 --- a/docker/README.md +++ b/docker/README.md @@ -1,7 +1,5 @@ # django-blog with docker -## quict start - run with docker ```shell From f81f1423009317a9ce5bf0550c125ffdef07f7e3 Mon Sep 17 00:00:00 2001 From: will Date: Wed, 3 Mar 2021 18:44:40 +0800 Subject: [PATCH 5/5] Update Dockerfile --- docker/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f4d29884..7dc0c67f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,14 +15,17 @@ RUN pip install --upgrade pip \ FROM python:3.6.10-alpine3.11 +ENV PYTHONDONTWRITEBYTECODE 1 +ENV PYTHONUNBUFFERED 1 + +WORKDIR /blog/ + RUN apk update \ && apk add --no-cache nginx bash git libjpeg COPY --from=builder /pippacks /pippacks COPY --from=builder /blog /blog -WORKDIR /blog/ - RUN pip install --no-index --find-links=/pippacks/wheels -r requirements.txt \ && pip install gunicorn bootstrap4 --no-index --find-links=/pippacks/wheels \ && rm -rf /pippacks