Merge branch 'develop'

.gitignore

@@ -20,3 +20,6 @@ package-lock.json
 # media files
 src/ARte/users/media/
 docker/media/
+
+# translations
+*.mo

docker/Dockerfile

@@ -1,11 +1,11 @@
 FROM jandigarte/requirements:latest
 
-RUN mkdir -p /src/ARte
-COPY docs/ /docs/
-COPY ./src/ARte /src/ARte
-
-COPY ./tasks.py /tasks.py
+RUN mkdir -p /ARte
+WORKDIR /ARte
+COPY docs/ /ARte/docs/
+COPY ./src/ARte /ARte/src/ARte/
+COPY ./locale/ /ARte/locale/
+COPY ./tasks.py /ARte/tasks.py
+COPY ./etc/ /ARte/etc/
 
 RUN find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
-
-ENTRYPOINT ["inv"]

docker/base.Dockerfile

@@ -3,8 +3,9 @@ FROM debian:buster-slim
 RUN apt-get update && apt-get install -y --no-install-recommends \
         python3 \
         python3-pip \
-        python3-setuptools
-
+        python3-setuptools \
+        gettext \
+        docutils-common
 COPY ./src/requirements.txt /src/requirements.txt
 
 RUN pip3 install --upgrade pip

docker/docker-compose.deploy.yml

@@ -43,7 +43,7 @@ services:
     volumes:
       - static_dev_files:/collect/
       - ./media/dev/:/src/ARte/users/media/
-    command: db -p docs collect run -g -p
+    command: inv db -p docs collect run -g -p
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 
@@ -72,7 +72,7 @@ services:
     volumes:
       - static_staging_files:/collect/
       - ./media/staging/:/src/ARte/users/media/
-    command: db -p docs collect run -g -p
+    command: inv db -p docs collect run -g -p
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 
@@ -102,7 +102,7 @@ services:
     volumes:
       - static_prod_files:/collect/
       - ./media/prod/:/src/ARte/users/media/    
-    command: db -p docs collect run -g -p
+    command: inv db -p docs collect run -g -p
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
 

docker/docker-compose.yml

@@ -10,14 +10,15 @@ services:
     ports:
       - 8000:8000
     volumes:
-      - ../src/ARte/:/src/ARte/
-      - ./media/:/src/ARte/users/media/
+      - ../src/ARte/:/ARte/src/ARte/
+      - ../locale/:/ARte/locale/
+      - ./media/:/ARte/src/ARte/users/media/
     env_file:
       - ../src/.envs/.django
       - ../src/.envs/.postgres
     depends_on:
       - postgres
-    command: db -p docs collect run -p
+    command: inv db -p i18n --compile docs collect run -p
 
   postgres:
     image: postgres