diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 412dfe2222a2270b99e04f45ae6f7cc1a0aaf00a..86be3c721de9c96fe7b20b105cc90874de458db7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,17 +1,21 @@ -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 diff --git a/Dockerfile b/Dockerfile index b327268283f83d50915608956b6c1772f46c3b2e..88a152f521b72d5b7385883b5f153c6e7d390bad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM clarinpl/cpp:16.04 -RUN apt update && apt install wsnlp-16-04 +RUN apt update && apt install wsnlp-16-04 awscli WORKDIR /home/install COPY src/ src/ diff --git a/README.TXT b/README.TXT deleted file mode 100644 index f0ff7db4fcc80664931d4ca24fc23a2784d2bef0..0000000000000000000000000000000000000000 --- a/README.TXT +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/README.md b/README.md new file mode 100644 index 0000000000000000000000000000000000000000..7031b5acfca649f53026405fd037e41334e515af --- /dev/null +++ b/README.md @@ -0,0 +1,13 @@ +## 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 +``` diff --git a/entrypoint.sh b/entrypoint.sh index e02282b46b6cb3586077e185a8778fde94962068..11886d9d9b5a1139c406a4e8b1945ba1cf85701c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,5 @@ #!/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/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 + ./morphodita_service