From b2a98a635d0808d39745c496a86b6c13ebe97f16 Mon Sep 17 00:00:00 2001
From: liangliangyy <liangliangyy@gmail.com>
Date: Sat, 26 Apr 2025 17:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                    |   6 +++---
 .../docker-compose/docker-compose.es.yml      |   0
 .../docker-compose/docker-compose.yml         |   3 ++-
 bin/docker_start.sh => deploy/entrypoint.sh   |   2 +-
 {bin => deploy}/nginx.conf                    |   0
 requirements.txt                              | Bin 2266 -> 2266 bytes
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename docker-compose.es.yml => deploy/docker-compose/docker-compose.es.yml (100%)
 rename docker-compose.yml => deploy/docker-compose/docker-compose.yml (97%)
 rename bin/docker_start.sh => deploy/entrypoint.sh (93%)
 rename {bin => deploy}/nginx.conf (100%)

diff --git a/Dockerfile b/Dockerfile
index 9b14ebe..fbc8f89 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,10 +6,10 @@ RUN  apt-get update && \
       rm -rf /var/lib/apt/lists/*
 ADD requirements.txt requirements.txt
 RUN pip install --upgrade pip  && \
-        pip install --no-cache-dir -r requirements.txt  && \
+        pip install --no-cache-dir -r requirements.txt -i  https://mirrors.aliyun.com/pypi/simple  && \
         pip install --no-cache-dir gunicorn[gevent] && \
         pip cache purge
         
 ADD . .
-RUN chmod +x /code/djangoblog/bin/docker_start.sh
-ENTRYPOINT ["/code/djangoblog/bin/docker_start.sh"]
+RUN chmod +x /code/djangoblog/deploy/entrypoint.sh
+ENTRYPOINT ["/code/djangoblog/deploy/entrypoint.sh"]
diff --git a/docker-compose.es.yml b/deploy/docker-compose/docker-compose.es.yml
similarity index 100%
rename from docker-compose.es.yml
rename to deploy/docker-compose/docker-compose.es.yml
diff --git a/docker-compose.yml b/deploy/docker-compose/docker-compose.yml
similarity index 97%
rename from docker-compose.yml
rename to deploy/docker-compose/docker-compose.yml
index 2735c32..9609af3 100644
--- a/docker-compose.yml
+++ b/deploy/docker-compose/docker-compose.yml
@@ -16,7 +16,8 @@ services:
     container_name: db
 
   djangoblog:
-    build: .
+    build:
+      context: ../../
     restart: always
     command: bash -c 'sh /code/djangoblog/bin/docker_start.sh'
     ports:
diff --git a/bin/docker_start.sh b/deploy/entrypoint.sh
similarity index 93%
rename from bin/docker_start.sh
rename to deploy/entrypoint.sh
index 0be35a5..2fb6491 100644
--- a/bin/docker_start.sh
+++ b/deploy/entrypoint.sh
@@ -18,7 +18,7 @@ python manage.py makemigrations && \
   python manage.py collectstatic --noinput  && \
   python manage.py compress --force && \
   python manage.py build_index && \
-  python manage.py compilemessages
+  python manage.py compilemessages  || exit 1
 
 exec gunicorn ${DJANGO_WSGI_MODULE}:application \
 --name $NAME \
diff --git a/bin/nginx.conf b/deploy/nginx.conf
similarity index 100%
rename from bin/nginx.conf
rename to deploy/nginx.conf
diff --git a/requirements.txt b/requirements.txt
index 5b62322442cf067bcc6b4384f2cf16b193745627..2e098322fa01b462d6e81aa54ee95895bc044355 100644
GIT binary patch
delta 25
hcmca5cuR1@IYvf{$%ahAn;$XGU}7}iT+I^C0swlX2xR~O

delta 25
hcmca5cuR1@IYvhF$%ahAn;$XGU}7}bT+I^C0swkx2weaG