From 7dbd6962cd939ab339192c278dc7cb0134906074 Mon Sep 17 00:00:00 2001
From: bwalkow <bwalkow@e-science.pl>
Date: Wed, 25 Jan 2023 09:29:00 +0100
Subject: [PATCH] New model source
---
.gitlab-ci.yml | 26 ++++++++++++++------------
Dockerfile | 2 +-
README.TXT | 9 ---------
README.md | 13 +++++++++++++
entrypoint.sh | 6 +++---
5 files changed, 31 insertions(+), 25 deletions(-)
delete mode 100644 README.TXT
create mode 100644 README.md
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 412dfe2..86be3c7 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 b327268..88a152f 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 f0ff7db..0000000
--- 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 0000000..7031b5a
--- /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 e02282b..11886d9 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
--
GitLab