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 5b62322..2e09832 100644 Binary files a/requirements.txt and b/requirements.txt differ diff --git a/templates/share_layout/base.html b/templates/share_layout/base.html index d3e0e42..1a2f095 100644 --- a/templates/share_layout/base.html +++ b/templates/share_layout/base.html @@ -31,6 +31,7 @@ href='{% static 'blog/fonts/fonts.css' %}' type='text/css' media='all'/> + {% compress css %} #} -{#
#} -{# #} + {#