Merge branch 'change_model_source' into 'master'

Change model source

See merge request !3

.gitlab-ci.yml

-image: clarinpl/python:3.6
-
-cache:
-  paths:
-    - .tox
-
 stages:
-  - build
+  - build_master
+  - build_develop
 
-before_script:
-  - pip install tox==2.9.1
+build_develop:
+  stage: build_develop
+  image: 'docker:18.09.7'
+  except:
+    - master
+  services:
+    - 'docker:18.09.7-dind'
+  script:
+    - docker build -t $CI_REGISTRY_IMAGE:develop .
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker push $CI_REGISTRY_IMAGE:develop
 
 build_image:
-  stage: build
+  stage: build_master
   image: 'docker:18.09.7'
   only:
     - master
@@ -19,8 +23,6 @@ build_image:
     - 'docker:18.09.7-dind'
   variables:
     DOCKERHUB_NAME: clarinpl/$CI_PROJECT_NAME
-  before_script:
-    - ''
   script:
     - docker build -t $DOCKERHUB_NAME .
     - echo $DOCKER_PASSWORD > pass.txt

Dockerfile

 FROM clarinpl/cpp:16.04
 
-RUN apt update && apt install wsnlp-16-04
+RUN apt update -y && apt install -y wsnlp-16-04 awscli
 
 WORKDIR /home/install
 COPY src/ src/

README.TXT

-1. get model
-
-
-wget -O model/xix http://minio.clarin-pl.eu/public/models/xix
-wget -O model/xxi http://minio.clarin-pl.eu/public/models/xxi
-
-2. Build 
-
-docker-compose build

README.md

+## 1. Get model:
+
+```
+aws --no-sign-request --endpoint-url https://s3.clarin-pl.eu s3 sync --delete s3://workers/morphodita/models/xix /home/worker/model/xix
+```
+```
+aws --no-sign-request --endpoint-url https://s3.clarin-pl.eu s3 sync --delete s3://workers/morphodita/models/xxi /home/worker/model/xxi
+```
+
+## 2. Build:
+```
+docker-compose build
+```

entrypoint.sh

 #!/bin/sh
-cd /home/worker
-wget -O model/xix http://minio.clarin-pl.eu/public/models/xix
-wget -O model/xxi http://minio.clarin-pl.eu/public/models/xxi
+aws --no-sign-request --endpoint-url "https://s3.clarin-pl.eu" s3 sync --delete "s3://workers/morphodita/" "/home/worker/model/"
+
 ./morphodita_service