Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
A
alem-ru-clustering
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Jira
Jira
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yeldar Toktasynov
alem-ru-clustering
Commits
737826bf
Commit
737826bf
authored
Feb 10, 2022
by
Yeldar Toktasynov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
created this dev branch and updated application.yml
parent
a1da3ab3
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
64 additions
and
14 deletions
+64
-14
.gitlab-ci.yml
.gitlab-ci.yml
+58
-9
app.py
app.py
+2
-1
application.yml
application.yml
+4
-4
No files found.
.gitlab-ci.yml
View file @
737826bf
image
:
"
10.20.4.30/devops/docker-builder:19.03.5"
stages
:
-
test
-
build
-
deploy
services
:
-
name
:
docker:19.03.5-dind
command
:
[
"
--insecure-registry=10.20.4.30"
]
-
name
:
"
10.30.20.233/mm/library/docker:stable-dind"
alias
:
docker
command
:
[
"
--insecure-registry=10.30.20.233"
]
dummy stage
:
stage
:
build
image
:
"
10.30.20.233/devops/docker-builder:19.03.5"
script
:
-
export
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
only
:
-
master
docker
build
image
:
docker
release
image
:
stage
:
build
image
:
"
10.30.20.233/devops/docker-builder:19.03.5"
script
:
-
docker build .
-
docker pull $CI_REGISTRY_IMAGE:latest ||
true
-
docker build --cache-from $CI_REGISTRY_IMAGE:latest . -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA -t $CI_REGISTRY_IMAGE:latest
-
docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-
docker push $CI_REGISTRY_IMAGE:latest
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
only
:
refs
:
-
master
changes
:
-
VERSION
deploy-alem-ru-clustering-01
:
stage
:
deploy
before_script
:
-
apk add bash
-
'
echo
"Before
script...."'
-
'
echo
$SSH_PRIVATE_KEY'
-
bash -c 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-
eval $(ssh-agent -s)
-
bash -c 'ssh-add <(echo "$SSH_PRIVATE_KEY")'
-
mkdir -p ~/.ssh
-
bash -c '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
script
:
-
scp application.yml mediamon@10.30.10.66:/home/mediamon/
-
scp docker-compose.yml mediamon@10.30.10.66:/home/mediamon/
-
ssh mediamon@10.30.10.66 "docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY && docker pull registry.gitlab.alem.kz/yeldartoktasynov/alem-ru-clustering && docker-compose up -d && exit"
only
:
refs
:
-
master
deploy-alem-ru-clustering-02
:
stage
:
deploy
before_script
:
-
apk add bash
-
'
echo
"Before
script...."'
-
'
echo
$SSH_PRIVATE_KEY'
-
bash -c 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-
eval $(ssh-agent -s)
-
bash -c 'ssh-add <(echo "$SSH_PRIVATE_KEY")'
-
mkdir -p ~/.ssh
-
bash -c '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
script
:
-
scp application.yml mediamon@10.30.10.247:/home/mediamon/
-
scp docker-compose.yml mediamon@10.30.10.247:/home/mediamon/
-
ssh mediamon@10.30.10.247 "docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY && docker pull registry.gitlab.alem.kz/yeldartoktasynov/alem-ru-clustering && docker-compose up -d && exit"
only
:
only
:
refs
:
-
master
app.py
View file @
737826bf
...
...
@@ -3,13 +3,14 @@ import numpy as np
import
logging
from
text_preparation
import
Preparation
from
cluster_faiss
import
Faiss_cluster
from
datetime
import
datetime
from
datetime
import
datetime
,
timedelta
from
db_cluster
import
table_class
,
create_session
import
uuid
import
pandas
as
pd
from
sys
import
getsizeof
from
sqlalchemy
import
or_
,
and_
logging
.
basicConfig
(
format
=
"
%(asctime)
s
%(message)
s"
)
"""
...
...
application.yml
View file @
737826bf
...
...
@@ -18,9 +18,9 @@ consumers:
producers
:
output
:
connection
:
default
queue
:
solr-update
-q-monorepo
routing_key
:
solr-update-k-monorepo
exchange
:
solr-update-x-monorepo
queue
:
geo-classification
-q-monorepo
routing_key
:
manual-markup-verifier-k
exchange
:
manual-markup-verifier-x
postgres
:
username
:
alem
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment