prepare docker files for 1.5.0.rc1

ciur · Oct 11, 2020 · a808896 · a808896
1 parent 2573163
commit a808896
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/docker/1.4/app.dockerfile b/docker/1.4/app.dockerfile
@@ -35,7 +35,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
 
 
-RUN git clone https://github.com/ciur/papermerge --branch v1.4.5 -q --depth 1 /opt/app
+RUN git clone https://github.com/ciur/papermerge  --branch v1.5.0.rc1 -q --depth 1 /opt/app
 
 RUN mkdir -p /opt/media
 
@@ -64,6 +64,6 @@ ENV DJANGO_SETTINGS_MODULE=config.settings.production
 
 RUN pip3 install -r requirements/base.txt --no-cache-dir
 RUN pip3 install -r requirements/production.txt --no-cache-dir
-RUN pip3 install -r requirements/extra.txt --no-cache-dir
+RUN pip3 install -r requirements/extra/pg.txt --no-cache-dir
 
 CMD ["/opt/app/startup.sh"]
diff --git a/docker/1.4/config/papermerge.config.py b/docker/1.4/config/papermerge.config.py
@@ -13,5 +13,9 @@
 
 OCR_LANGUAGES = {
     "deu": "Deutsch",
-    "spa": "Spanish",
+    "spa": "Español",
+    "eng": "English",
+    "fra": "Français",
+    "rus": "Русский",
+    "ron": "Română"
 }
diff --git a/docker/1.4/docker-compose.yml b/docker/1.4/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   app:
-    image: eugenci/papermerge:1.4.5
+    image: eugenci/papermerge:1.5.0.rc1
     build:
       context: .
       dockerfile: app.dockerfile
@@ -30,7 +30,7 @@ services:
       - POSTGRES_PASSWORD=dbpass
       - POSTGRES_DB=dbname
   worker:
-    image: eugenci/papermerge-worker:1.4.5
+    image: eugenci/papermerge-worker:1.5.0.rc1
     build:
       context: .
       dockerfile: worker.dockerfile    

diff --git a/docker/1.4/worker.dockerfile b/docker/1.4/worker.dockerfile
@@ -21,6 +21,8 @@ RUN apt-get update \
                     tesseract-ocr-deu \
                     tesseract-ocr-eng \
                     tesseract-ocr-fra \
+                    tesseract-ocr-rus \
+                    tesseract-ocr-ron \
                     tesseract-ocr-spa \
  && rm -rf /var/lib/apt/lists/* \
  && pip3 install --upgrade pip
@@ -38,7 +40,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 ENV LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
 
 
-RUN git clone https://github.com/ciur/papermerge --branch v1.4.5 -q --depth 1 /opt/app
+RUN git clone https://github.com/ciur/papermerge --branch v1.5.0.rc1 -q --depth 1 /opt/app
 
 RUN mkdir -p /opt/media
 
@@ -65,6 +67,6 @@ ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 ENV DJANGO_SETTINGS_MODULE=config.settings.production
 
 RUN pip3 install -r requirements/base.txt --no-cache-dir
-RUN pip3 install -r requirements/extra.txt --no-cache-dir
+RUN pip3 install -r requirements/extra/pg.txt --no-cache-dir
 
 CMD ["/opt/app/startup.sh"]