Skip to content

Some fixes for the Docker setup #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clementsjosh merged 5 commits into from
Sep 24, 2020
Merged

Some fixes for the Docker setup #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8484c3e
Allow to run Makefile command without sudo
JeanFred Apr 14, 2020
4efb585
Set POSTGRES_HOST_AUTH_METHOD in Postgres Docker
JeanFred Apr 14, 2020
93131ae
Add gettext to makefile dependencies
JeanFred Apr 14, 2020
9f4ac38
Fix variable in French locale
JeanFred Apr 14, 2020
a7045b9
Set STATIC_ROOT for serving static assets using Whitenoise
JeanFred Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ services:
build:
context: contrib
dockerfile: Dockerfile.postgres
environment:
POSTGRES_HOST_AUTH_METHOD: 'trust'

memcached:
image: memcached:1.4
Expand Down
4 changes: 3 additions & 1 deletion makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
APT=sudo apt-get

all: help

help:
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion mygpo/locale/fr/LC_MESSAGES/django.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mygpo/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')),)
Expand Down