Merge pull request #762 from liangliangyy/dev

修改目录结构

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

bin/docker_start.sh renamed to deploy/entrypoint.sh

@@ -31,6 +31,7 @@
           href='{% static 'blog/fonts/fonts.css' %}'
           type='text/css' media='all'/>
     <link rel="dns-prefetch" href="//cdn.mathjax.org"/>
+    <link rel="shortcut icon" href="favorite.ico" type="image/x-icon"/>
     {% compress css %}
 
         <link rel='stylesheet' id='twentytwelve-style-css' href='{% static 'blog/css/style.css' %}' type='text/css'
@@ -61,22 +62,22 @@ <h2 class="site-description">{{ SITE_DESCRIPTION }}</h2>
         {% load i18n %}
 
 
-{#        <div class="i18n-selector">#}
-{#            <form action="{% url 'set_language' %}" method="post" id="i18n-form">{% csrf_token %}#}
-{#                <input name="next" type="hidden" value="{{ redirect_to }}">#}
-{#                <select name="language" class="i18n-select" >#}
-{#                    {% get_current_language as LANGUAGE_CODE %}#}
-{#                    {% get_available_languages as LANGUAGES %}#}
-{#                    {% get_language_info_list for LANGUAGES as languages %}#}
-{#                    {% for language in languages %}#}
-{#                        <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>#}
-{#                            {{ language.name_local }} ({{ language.code }})#}
-{#                        </option>#}
-{#                    {% endfor %}#}
-{#                </select>#}
-{#                                <input type="submit" value="Go">#}
-{#            </form>#}
-{#        </div>#}
+        {#        <div class="i18n-selector">#}
+        {#            <form action="{% url 'set_language' %}" method="post" id="i18n-form">{% csrf_token %}#}
+        {#                <input name="next" type="hidden" value="{{ redirect_to }}">#}
+        {#                <select name="language" class="i18n-select" >#}
+        {#                    {% get_current_language as LANGUAGE_CODE %}#}
+        {#                    {% get_available_languages as LANGUAGES %}#}
+        {#                    {% get_language_info_list for LANGUAGES as languages %}#}
+        {#                    {% for language in languages %}#}
+        {#                        <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>#}
+        {#                            {{ language.name_local }} ({{ language.code }})#}
+        {#                        </option>#}
+        {#                    {% endfor %}#}
+        {#                </select>#}
+        {#                                <input type="submit" value="Go">#}
+        {#            </form>#}
+        {#        </div>#}
 
 
         {% include 'share_layout/nav.html' %}