diff --git a/Dockerfile b/Dockerfile index 3244e345a..2e6180b2f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ WORKDIR /srv/mygpo COPY makefile . # install all packaged runtime dependencies -RUN yes | make install-deps +RUN yes | make install-deps APT=apt-get # create log directories RUN mkdir -p /var/log/gunicorn diff --git a/docker-compose.yml b/docker-compose.yml index 5311f565e..31ced40cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,8 @@ services: build: context: contrib dockerfile: Dockerfile.postgres + environment: + POSTGRES_HOST_AUTH_METHOD: 'trust' memcached: image: memcached:1.4 diff --git a/makefile b/makefile index 76cbda4e3..8fb5d893f 100644 --- a/makefile +++ b/makefile @@ -1,3 +1,5 @@ +APT=sudo apt-get + all: help help: @@ -34,7 +36,7 @@ clean: git clean -fX install-deps: - sudo apt-get install libpq-dev libjpeg-dev zlib1g-dev libwebp-dev \ + $(APT) install libpq-dev libjpeg-dev zlib1g-dev libwebp-dev gettext \ build-essential python3-dev virtualenv libffi-dev redis postgresql docker-build: diff --git a/mygpo/locale/fr/LC_MESSAGES/django.po b/mygpo/locale/fr/LC_MESSAGES/django.po index e968b0862..257bc6c64 100644 --- a/mygpo/locale/fr/LC_MESSAGES/django.po +++ b/mygpo/locale/fr/LC_MESSAGES/django.po @@ -813,7 +813,7 @@ msgstr "Podcast inconnu" #: mygpo/podcasts/models.py:700 #, python-brace-format msgid "Unknown Podcast from {domain}" -msgstr "Podcast inconnu de {domaine}" +msgstr "Podcast inconnu de {domain}" #: mygpo/podcasts/templates/episode.html:85 #: mygpo/podcasts/templates/episodes.html:27 diff --git a/mygpo/settings.py b/mygpo/settings.py index 393d22b20..648f8b5dc 100644 --- a/mygpo/settings.py +++ b/mygpo/settings.py @@ -86,7 +86,7 @@ def get_intOrNone(name, default): # Static Files -STATIC_ROOT = 'staticfiles' +STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') STATIC_URL = '/static/' STATICFILES_DIRS = (os.path.abspath(os.path.join(BASE_DIR, '..', 'static')),)