From fdcb07e2c15c3c022b62606a22e214bb8c990ecd Mon Sep 17 00:00:00 2001 From: 11617 <1161733918@qq.com> Date: Fri, 11 Nov 2022 10:11:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/views.py | 2 +- Dockerfile | 13 +++++++++++++ deployment.yaml | 36 ++++++++++++++++++++++++++++++++++++ docker-compose.yml | 28 ++++++++++++++++++++++++++++ docker-entrypoint.sh | 4 ++++ 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 Dockerfile create mode 100644 deployment.yaml create mode 100644 docker-compose.yml create mode 100644 docker-entrypoint.sh diff --git a/App/views.py b/App/views.py index d796b8c..51f4e6a 100644 --- a/App/views.py +++ b/App/views.py @@ -96,7 +96,7 @@ def register(request): return render(request, 'register.html') -@cache_page(60) +#@cache_page(60) @login_required def dashboard(request, type): username = auth.get_user(request).username diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..5db81d2 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,13 @@ +FROM python:3.10.5 + +LABEL MAINTAINER="XIAOMING" +# scp ./* 容器:/webapp/ +COPY . /webapp + +# cd /webapp +WORKDIR /webapp + +RUN pip install -r requirements.txt -i https://mirrors.aliyun.com/pypi/simple +EXPOSE 8000 +COPY ./docker-entrypoint.sh / +CMD ["sh", "/docker-entrypoint.sh" ] diff --git a/deployment.yaml b/deployment.yaml new file mode 100644 index 0000000..9f16825 --- /dev/null +++ b/deployment.yaml @@ -0,0 +1,36 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: django +spec: + replicas: 2 + selector: + matchLabels: + app: django + template: + metadata: + labels: + app: django + spec: + imagePullSecrets: + - name: login + containers: + - name: django + image: 192.168.96.155/xiaoming/django:v1.0 + ports: + - containerPort: 8000 + + - name: mysql + image: mysql:5.7 + ports: + - containerPort: 3306 + env: + - name: MYSQL_ROOT_PASSWORD + value: "QianFeng@123" + - name: MYSQL_DATABASE + value: "object" + args: + - "--character-set-server=utf8mb4" + - "--collation-server=utf8mb4_unicode_ci" + - name: redis + image: redis diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b49c6b0 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,28 @@ +version: '3' +services: + blog: + container_name: blog + hostname: blog + build: . + ports: + - 8000:8000 + links: + - db:mysql.server + - redis:redis.server + depends_on: + - db + - redis + + db: + image: daocloud.io/library/mysql:5.7 + environment: + - MYSQL_DATABASE=object + - MYSQL_ROOT_PASSWORD=QianFeng@123 + command: + - --character-set-server=utf8mb4 + - --collation-server=utf8mb4_general_ci + + + redis: + image: daocloud.io/library/redis + diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh new file mode 100644 index 0000000..84ef691 --- /dev/null +++ b/docker-entrypoint.sh @@ -0,0 +1,4 @@ +echo "启动成功" +sleep 10 +python manage.py migrate +python manage.py runserver 0.0.0.0:8000 \ No newline at end of file