修改目录结构

Author: liangliangyy

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"]

docker-compose.es.yml …loy/docker-compose/docker-compose.es.ymldocker-compose.es.yml renamed to deploy/docker-compose/docker-compose.es.yml docker-compose.es.yml renamed to deploy/docker-compose/docker-compose.es.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:

docker-compose.yml deploy/docker-compose/docker-compose.ymldocker-compose.yml renamed to deploy/docker-compose/docker-compose.yml

@@ -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 \