From 03f597a30721dea4112b3bff856f26d9e671f816 Mon Sep 17 00:00:00 2001
From: bwalkow <bwalkow@e-science.pl>
Date: Mon, 19 Jun 2023 10:56:54 +0200
Subject: [PATCH] Fix nlp-ws version, refactor CI
---
.gitlab-ci.yml | 34 +++++++---------------------------
requirements.txt | 2 +-
2 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9093c98..77a2e6e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,38 +1,18 @@
image: 'clarinpl/python:3.6'
-cache:
- paths:
- - .tox
+
stages:
- # - check_style
- build
-before_script:
- - pip install tox==2.9.1
-# pep8:
-# stage: check_style
-# script:
-# - tox -v -e pep8
-# docstyle:
-# stage: check_style
-# script:
-# - tox -v -e docstyle
+
build_image:
stage: build
- image: 'docker:18.09.7'
+ image: docker:18.09
only:
- v1
services:
- - 'docker:18.09.7-dind'
- variables:
- DOCKERHUB_NAME: clarinpl/anonymizer
- before_script:
- - ''
+ - docker
script:
- - docker build -t $DOCKERHUB_NAME .
- - echo $DOCKER_PASSWORD > pass.txt
- - cat pass.txt | docker login --username $DOCKER_USERNAME --password-stdin
- - rm pass.txt
- - docker push $DOCKERHUB_NAME
+ - docker build -t $CI_REGISTRY_IMAGE:v1 .
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker image tag $DOCKERHUB_NAME $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
- - docker push $CI_REGISTRY_IMAGE
+ - docker push $CI_REGISTRY_IMAGE:v1
+
diff --git a/requirements.txt b/requirements.txt
index 9022646..a3ae399 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-nlp-ws
+nlp-ws<=0.8
regex==2020.10.28
Babel==2.8.0
\ No newline at end of file
--
GitLab