Compare commits

...

3 Commits

4 changed files with 34 additions and 28 deletions

View File

@@ -9,9 +9,9 @@ ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
COPY requirements.txt ${APP_HOME}
COPY gunicorn-cfg.py ${APP_HOME}
COPY run.sh ${APP_HOME}
RUN chmod +x ${APP_HOME}/run.sh
#COPY gunicorn-cfg.py ${APP_HOME}
#COPY run.sh ${APP_HOME}
#RUN chmod +x ${APP_HOME}/run.sh
# install python dependencies

View File

@@ -36,6 +36,10 @@ services:
MYSQL_DATABASE: ${MYSQL_DATABASE}
MYSQL_USER: ${MYSQL_USER}
MYSQL_PASSWORD: ${MYSQL_PASSWORD}
volumes:
- .:/app:rw
- ./staticfiles:/app/static
- ./mediafiles:/app/media
command: bash -c 'cd /app && ./run.sh'
depends_on:
mysql:

3
run.sh Normal file → Executable file
View File

@@ -1,5 +1,6 @@
#!/bin/bash
cd src &&
python manage.py migrate &&
python manage.py fill_empty_db &&
gunicorn --config gunicorn-cfg.py kalskeborec.wsgi
gunicorn --config ../gunicorn-cfg.py kalskeborec.wsgi

View File

@@ -46,13 +46,12 @@
spadnete do
jedné z kategorií.</em></p><br>
<div class="w3-row-padding w3-justify">
<div class="w3-row-padding" style="display: flex; flex-wrap: wrap;">
{% for category in event.categories.all %}
<div class="w3-col m6 w3-margin-bottom-16">
<div class="w3-col m6 w3-margin-bottom-16" style="display: flex;">
<div style="display: flex; flex-direction: column; width: 100%; border: 1px solid #ddd; padding: 16px;">
<h4 class="w3-text-purple">// {{ category.name }}</h4>
<p>
{{ category.description }}
</p>
<p>{{ category.description }}</p>
{% if category.length %}
<p>Dlzka: {{ category.length }} m</p>
{% endif %}
@@ -63,15 +62,17 @@
<p><a href="{{ category.gpx.url }}">GPX</a></p>
{% endif %}
<div style="margin-top: auto;">
{% if category.mapy_cz_url %}
<iframe style="border:none" src="{{ category.mapy_cz_url }}" width="100%" height="280" frameborder="0"></iframe>
{% endif %}
</div>
{% empty %}
Zatím nebyly vytvořeny žádné kategorie.
{% endfor %}
</div>
</div>
{% empty %}
<div class="w3-col s12">Zatím nebyly vytvořeny žádné kategorie.</div>
{% endfor %}
</div>
</div>
</section>