From 386e7d1bf88f67ef15661681aa97c44a1f59d9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Tue, 22 Oct 2019 15:39:51 +0300 Subject: [PATCH 01/44] First CI --- compose_ci.yml | 101 +++++++++++++++++++++++++++++++++++++++++++++++++ fabfile.py | 75 ++++++++++++++++++++++++++++++++++++ gitlab-ci.yml | 60 +++++++++++++++++++++++++++++ 3 files changed, 236 insertions(+) create mode 100644 compose_ci.yml create mode 100644 fabfile.py create mode 100644 gitlab-ci.yml diff --git a/compose_ci.yml b/compose_ci.yml new file mode 100644 index 00000000..3c41f200 --- /dev/null +++ b/compose_ci.yml @@ -0,0 +1,101 @@ +version: '3.5' +services: + # PostgreSQL database + db: + build: + context: ./_dockerfiles/db + dockerfile: Dockerfile + hostname: db + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=postgres + ports: + - "5436:5432" + volumes: + - gm-db:/var/lib/postgresql/data/ + + elasticsearch: + image: elasticsearch:7.3.1 + volumes: + - gm-esdata:/usr/share/elasticsearch/data + hostname: elasticsearch + ports: + - 9200:9200 + - 9300:9300 + environment: + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + - discovery.type=single-node + - xpack.security.enabled=false + + # Redis + redis: + image: redis:2.8.23 + ports: + - "6379:6379" + + # Celery + worker: + build: . + command: ./run_celery.sh + environment: + - SETTINGS_CONFIGURATION=local + - DB_NAME=postgres + - DB_USERNAME=postgres + - DB_HOSTNAME=db + - DB_PORT=5432 + - DB_PASSWORD=postgres + volumes: + - .:/code + links: + - db + - redis + + worker_beat: + build: . + command: ./run_celery_beat.sh + environment: + - SETTINGS_CONFIGURATION=local + - DB_NAME=postgres + - DB_USERNAME=postgres + - DB_HOSTNAME=db + - DB_PORT=5432 + - DB_PASSWORD=postgres + volumes: + - .:/code + links: + - db + - redis + + + # App: G&M + gm_app: + build: . + command: python manage.py runserver 0.0.0.0:8000 + environment: + - SETTINGS_CONFIGURATION=local + - DB_HOSTNAME=db + - DB_PORT=5432 + - DB_NAME=postgres + - DB_USERNAME=postgres + - DB_PASSWORD=postgres + depends_on: + - db + - redis + - worker + - worker_beat + - elasticsearch + volumes: + - .:/code + - gm-media:/media-data + ports: + - "8000:8000" + +volumes: + gm-db: + name: gm-db + + gm-media: + name: gm-media + + gm-esdata: \ No newline at end of file diff --git a/fabfile.py b/fabfile.py new file mode 100644 index 00000000..643080be --- /dev/null +++ b/fabfile.py @@ -0,0 +1,75 @@ +import os # NOQA +from fabric.api import * # NOQA + +user = 'gm' + +env.root = '~/' +env.src = '~/project' + +env.default_branch = 'feature/develop_ci' +env.tmpdir = '~/tmp' + + +env.roledefs = { + 'develop': { + 'branch': env.default_branch, + 'hosts': ['%s@rock.spider.ru:31' % user, ] + }, + 'staging': { + 'hosts': ['%s@5.200.53.99' % user, ] + }, + 'production': { + 'branch': 'master', + 'hosts': ['%s@87.226.166.80' % user, ] + } +} + + +def fetch(branch=None): + with cd(env.src): + role = env.roles[0] + run('git pull origin {}'.format(env.roledefs[role]['branch'])) + run('git submodule update') + + +def migrate(): + with cd(env.src): + run('./manage.py migrate') + + +def install_requirements(): + with cd(env.src): + run('pip install -r requirements/base.txt') + + +def touch(): + with cd(env.src): + run('touch ~/%s.touch' % user) + + +def kill_celery(): + """Kill celery workers for $user.""" + with cd(env.src): + run('ps -u %s -o pid,fname | grep celery | (while read a b; do kill -9 $a; done;)' % user) + + +def collectstatic(): + with cd(env.src): + run('./manage.py collectstatic --noinput') + + +def deploy(branch=None): + fetch() + install_requirements() + migrate() + collectstatic() + touch() + kill_celery() + + +def rev(): + """Show head commit.""" + with hide('running', 'stdout'): + with cd(env.src): + commit = run('git rev-parse HEAD') + return local('git show -q %s' % commit) diff --git a/gitlab-ci.yml b/gitlab-ci.yml new file mode 100644 index 00000000..0de48055 --- /dev/null +++ b/gitlab-ci.yml @@ -0,0 +1,60 @@ +image: docker:latest + +stages: + - hello + +#stages: +# - build +# - test +# - deploy +# - clean +# + +before_script: + - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make + - pip install docker-compose + + +hello: + - echo 'Test GitLab CI' + +#clean: +# stage: clean +# script: +# - docker-compose -f compose-ci.yml stop +# - docker-compose -f compose-ci.yml rm --force gm_app +# when: always +# +# +#buid: +# stage: build +# script: +# - docker-compose -f compose-ci.yml build gm_app +# when: always +# +# +#test: +# stage: test +# script: +# - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput +# when: always +# +# +#deploy-develop: +# stage: deploy +# only: +# - feature/develop_ci +# script: +# - fab --roles=develop deploy +# environment: +# name: Develop +# +# +##deploy-staging: +## stage: deploy +## only: +## - master +## script: +## - fab --roles=staging deploy +## environment: +## name: Staging From 580081f76d6a107300d8ff26c4646988b4ade911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Tue, 22 Oct 2019 15:41:10 +0300 Subject: [PATCH 02/44] 1 --- gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 0de48055..aaa3fb35 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -16,7 +16,10 @@ before_script: hello: - - echo 'Test GitLab CI' + script: + - echo 'Test GitLab CI' + only: + - feature/develop_ci #clean: # stage: clean From 307abddbbf12cc383ee0d59774114a232d8a94ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Tue, 22 Oct 2019 15:43:26 +0300 Subject: [PATCH 03/44] 1 --- gitlab-ci.yml => .gitlab-ci.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gitlab-ci.yml => .gitlab-ci.yml (100%) diff --git a/gitlab-ci.yml b/.gitlab-ci.yml similarity index 100% rename from gitlab-ci.yml rename to .gitlab-ci.yml From ba58b74fdff200711fb106830b9cd5905652e0ff Mon Sep 17 00:00:00 2001 From: "v.gladkikh" Date: Tue, 22 Oct 2019 12:44:48 +0000 Subject: [PATCH 04/44] Update .gitlab-ci.yml --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aaa3fb35..162d90bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,8 @@ before_script: hello: script: - echo 'Test GitLab CI' - only: - - feature/develop_ci + only: + - feature/develop_ci #clean: # stage: clean From e70efe36094ba63329c3f0efa9ca429a6e8b5dc6 Mon Sep 17 00:00:00 2001 From: "v.gladkikh" Date: Tue, 22 Oct 2019 12:45:53 +0000 Subject: [PATCH 05/44] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 162d90bd..9995a2e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ before_script: hello: + stage: hello script: - echo 'Test GitLab CI' only: From e1e3799c5f68887dd3eddacc240c523e0beb1d04 Mon Sep 17 00:00:00 2001 From: "v.gladkikh" Date: Tue, 22 Oct 2019 12:49:47 +0000 Subject: [PATCH 06/44] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9995a2e4..7bcfe10c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,9 @@ stages: # - clean # -before_script: - - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make - - pip install docker-compose +# before_script: +# - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make +# - pip install docker-compose hello: From 778162922e16049bae9ab56158f8c277332efef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 10:39:10 +0300 Subject: [PATCH 07/44] Test runner --- .gitignore | 4 +++- .gitlab-ci.yml | 57 +++++++++++++++++++------------------------- celerybeat-schedule | Bin 12845 -> 0 bytes 3 files changed, 27 insertions(+), 34 deletions(-) delete mode 100644 celerybeat-schedule diff --git a/.gitignore b/.gitignore index a32ff3df..5d44eda8 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,6 @@ logs/ /geoip_db/ # dev -./docker-compose.override.yml \ No newline at end of file +./docker-compose.override.yml + +celerybeat-schedule diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aaa3fb35..b43dc9dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,48 +1,39 @@ image: docker:latest stages: - - hello - -#stages: -# - build -# - test + - build + - test # - deploy -# - clean -# + - clean + before_script: - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make - pip install docker-compose -hello: +clean: + stage: clean script: - - echo 'Test GitLab CI' - only: - - feature/develop_ci + - docker-compose -f compose-ci.yml stop + - docker-compose -f compose-ci.yml rm --force gm_app + when: always + + +buid: + stage: build + script: + - docker-compose -f compose-ci.yml build gm_app + when: always + + +test: + stage: test + script: + - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput + when: always + -#clean: -# stage: clean -# script: -# - docker-compose -f compose-ci.yml stop -# - docker-compose -f compose-ci.yml rm --force gm_app -# when: always -# -# -#buid: -# stage: build -# script: -# - docker-compose -f compose-ci.yml build gm_app -# when: always -# -# -#test: -# stage: test -# script: -# - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput -# when: always -# -# #deploy-develop: # stage: deploy # only: diff --git a/celerybeat-schedule b/celerybeat-schedule deleted file mode 100644 index 3efe528a0f0c9bb6e563876fdc4c1a02541e62f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12845 zcmeI#O=}ZD7zgl4H!sbkY1*c~KvBH46}rS41i^z)JQYQ@6$66HW;3wCxXqKDhzSI8 zD*6@t0OC>n0($l0#iJ+jD0uZE=uBo(69^u1C@TLfyU)z-W@h)dGY`8TUfeIU6~;!Z z3OeR(e5vD2yxPdjEOT_n(NO&36UWZAq>0KOKKK!`TSH0S=P_ zro8d+&Bd+^{hf*YjQ7dkPRO6e0uJ*z1kb;fMJzka&aa$mMt>8+b3V_vuMf}5K4Y8q zdwD@Mqd%GdHc$P`n<5!H17faz0q!KtquBR{PA#J@x9VPXE9!{s51l)%PQW4#>MhY2 zI?vq6|JKf`vqRAmot|3{!bc)*_+d)~akovWaC|@nk{^VTXmnfRmg>33X<;i$MX9h6 zNFke#1wSc}v&VB^a_0&cuCu!jC>^$Yvd{f{hkKkd+a6_)Dd*ARJ{z~5*oG4xc8+2h z)H&t1YAJPH72=~K{oMk_QYagRb&t*@?k}_khc*BJ From 9383c806b0b6467f48665d1a08a71e99baa9ecf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 10:45:29 +0300 Subject: [PATCH 08/44] Fix --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9c5694f4..7414f21f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,9 +7,9 @@ stages: - clean -# before_script: -# - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make -# - pip install docker-compose + before_script: + - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make + - pip install docker-compose clean: stage: clean From 19facc3b94c47aefa7f8b4ea9abab4a5192a2a56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 10:46:56 +0300 Subject: [PATCH 09/44] Fix --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7414f21f..a364ad5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,7 @@ stages: # - deploy - clean - - before_script: +before_script: - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make - pip install docker-compose From f11a194eb2f9db7101834f1fc48e0ed0c7a3d9a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 10:49:41 +0300 Subject: [PATCH 10/44] Fix --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a364ad5a..b4d0e418 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,8 @@ stages: - clean before_script: - - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make + - apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make +# - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make - pip install docker-compose clean: From fea2764bde617193a3dce57d7af4f99a22d2afe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 10:51:09 +0300 Subject: [PATCH 11/44] Fix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4d0e418..a04a6a03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - clean before_script: - - apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make + - sudo apt install -y python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make # - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make - pip install docker-compose From 0961d3ee7360061b50bfaa26f2043d3cf4fe29c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 10:57:08 +0300 Subject: [PATCH 12/44] Fix --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a04a6a03..1e64cf22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - clean before_script: - - sudo apt install -y python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make + - sudo apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make # - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make - pip install docker-compose From 89c949c12c2200d4a1e66d0b423cfa0ebcd8620d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 10:59:04 +0300 Subject: [PATCH 13/44] Fix --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e64cf22..d36fdf49 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,10 +6,10 @@ stages: # - deploy - clean -before_script: - - sudo apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make -# - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make - - pip install docker-compose +#before_script: +# - sudo apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make +## - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make +# - pip install docker-compose clean: stage: clean From 78209a11015a9bacacc8d8e98e57fdfae77b3f06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:02:43 +0300 Subject: [PATCH 14/44] pwd --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d36fdf49..f730977d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,7 @@ stages: clean: stage: clean script: + - pwd - docker-compose -f compose-ci.yml stop - docker-compose -f compose-ci.yml rm --force gm_app when: always From dd7a578a12c497d983e37e7409f93a2166afbca2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:04:52 +0300 Subject: [PATCH 15/44] pwd --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f730977d..e3163c20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,6 @@ stages: clean: stage: clean script: - - pwd - docker-compose -f compose-ci.yml stop - docker-compose -f compose-ci.yml rm --force gm_app when: always @@ -23,6 +22,7 @@ clean: buid: stage: build script: + - pwd - docker-compose -f compose-ci.yml build gm_app when: always From cddab519e4dba53ba38954e850230b71ea2b927f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:07:01 +0300 Subject: [PATCH 16/44] pwd --- .gitlab-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3163c20..88ec7752 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,21 +2,21 @@ image: docker:latest stages: - build - - test +# - test # - deploy - - clean +# - clean #before_script: # - sudo apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make ## - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make # - pip install docker-compose -clean: - stage: clean - script: - - docker-compose -f compose-ci.yml stop - - docker-compose -f compose-ci.yml rm --force gm_app - when: always +#clean: +# stage: clean +# script: +# - docker-compose -f compose-ci.yml stop +# - docker-compose -f compose-ci.yml rm --force gm_app +# when: always buid: @@ -27,11 +27,11 @@ buid: when: always -test: - stage: test - script: - - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput - when: always +#test: +# stage: test +# script: +# - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput +# when: always #clean: From 5c7af176fdaced52c170911c661afe43656a7bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:09:11 +0300 Subject: [PATCH 17/44] pwd --- .gitlab-ci.yml | 26 +++++++++++++------------- compose_ci.yml => compose-ci.yml | 0 2 files changed, 13 insertions(+), 13 deletions(-) rename compose_ci.yml => compose-ci.yml (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88ec7752..e3163c20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,21 +2,21 @@ image: docker:latest stages: - build -# - test + - test # - deploy -# - clean + - clean #before_script: # - sudo apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make ## - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make # - pip install docker-compose -#clean: -# stage: clean -# script: -# - docker-compose -f compose-ci.yml stop -# - docker-compose -f compose-ci.yml rm --force gm_app -# when: always +clean: + stage: clean + script: + - docker-compose -f compose-ci.yml stop + - docker-compose -f compose-ci.yml rm --force gm_app + when: always buid: @@ -27,11 +27,11 @@ buid: when: always -#test: -# stage: test -# script: -# - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput -# when: always +test: + stage: test + script: + - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput + when: always #clean: diff --git a/compose_ci.yml b/compose-ci.yml similarity index 100% rename from compose_ci.yml rename to compose-ci.yml From 1755c192b6f71c0a8eee14a9e915a14d76db7f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:10:15 +0300 Subject: [PATCH 18/44] pwd --- compose-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose-ci.yml b/compose-ci.yml index 3c41f200..3920500f 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -1,4 +1,4 @@ -version: '3.5' +version: '2.0' services: # PostgreSQL database db: From fd65c986604c4ba024539ffaf1cb64cabbfa3abe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:12:53 +0300 Subject: [PATCH 19/44] pwd --- compose-ci.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/compose-ci.yml b/compose-ci.yml index 3920500f..fdab41b2 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -1,6 +1,5 @@ -version: '2.0' +version: '2' services: - # PostgreSQL database db: build: context: ./_dockerfiles/db @@ -91,11 +90,11 @@ services: ports: - "8000:8000" -volumes: - gm-db: - name: gm-db - - gm-media: - name: gm-media - - gm-esdata: \ No newline at end of file +#volumes: +# gm-db: +# name: gm-db +# +# gm-media: +# name: gm-media +# +# gm-esdata: \ No newline at end of file From d6a9fa6ac0864bcc0b627b5bbba96c15ab226d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:18:26 +0300 Subject: [PATCH 20/44] pwd --- compose-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compose-ci.yml b/compose-ci.yml index fdab41b2..83b20a44 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -90,11 +90,11 @@ services: ports: - "8000:8000" -#volumes: -# gm-db: +volumes: + gm-db: # name: gm-db # -# gm-media: + gm-media: # name: gm-media # -# gm-esdata: \ No newline at end of file + gm-esdata: \ No newline at end of file From 7ed853e7a4b6559358d39fde780c5acd07f4cab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:44:59 +0300 Subject: [PATCH 21/44] Fix fab --- .gitlab-ci.yml | 24 ------------------------ fabfile.py | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 34 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e3163c20..7668f645 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,6 @@ clean: buid: stage: build script: - - pwd - docker-compose -f compose-ci.yml build gm_app when: always @@ -34,29 +33,6 @@ test: when: always -#clean: -# stage: clean -# script: -# - docker-compose -f compose-ci.yml stop -# - docker-compose -f compose-ci.yml rm --force gm_app -# when: always -# -# -#buid: -# stage: build -# script: -# - docker-compose -f compose-ci.yml build gm_app -# when: always -# -# -#test: -# stage: test -# script: -# - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput -# when: always -# -# - #deploy-develop: # stage: deploy # only: diff --git a/fabfile.py b/fabfile.py index 643080be..90052b4c 100644 --- a/fabfile.py +++ b/fabfile.py @@ -1,18 +1,12 @@ -import os # NOQA +import os # NOQA from fabric.api import * # NOQA + user = 'gm' -env.root = '~/' -env.src = '~/project' - -env.default_branch = 'feature/develop_ci' -env.tmpdir = '~/tmp' - - env.roledefs = { 'develop': { - 'branch': env.default_branch, + 'branch': 'develop', 'hosts': ['%s@rock.spider.ru:31' % user, ] }, 'staging': { @@ -25,6 +19,13 @@ env.roledefs = { } +env.root = '~/' +env.src = '~/project' + +env.default_branch = 'develop' +env.tmpdir = '~/tmp' + + def fetch(branch=None): with cd(env.src): role = env.roles[0] @@ -72,4 +73,4 @@ def rev(): with hide('running', 'stdout'): with cd(env.src): commit = run('git rev-parse HEAD') - return local('git show -q %s' % commit) + return local('git show -q %s' % commit) \ No newline at end of file From 1b218a5c0754893c7d4343722e6f1ad841e72bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 11:51:25 +0300 Subject: [PATCH 22/44] Fix fab --- .gitlab-ci.yml | 15 ++++++++++----- fabfile.py | 3 +++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7668f645..76a23eaf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,18 @@ image: docker:latest stages: - - build - - test -# - deploy - - clean + - fabtest +# - build +# - test +## - deploy +# - clean + +fabtest: + stage: fabtest + script: + - fab test #before_script: -# - sudo apt install python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make ## - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make # - pip install docker-compose diff --git a/fabfile.py b/fabfile.py index 90052b4c..c06e42d0 100644 --- a/fabfile.py +++ b/fabfile.py @@ -2,6 +2,9 @@ import os # NOQA from fabric.api import * # NOQA +def test(): + print('Fab test') + user = 'gm' env.roledefs = { From 4d1d16637e6329bd0fe5e87928ae4032ed7249cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 12:01:46 +0300 Subject: [PATCH 23/44] add deploy --- .gitlab-ci.yml | 50 ++++++++++++++++++++++---------------------------- fabfile.py | 4 +--- 2 files changed, 23 insertions(+), 31 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76a23eaf..78bcc748 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,16 +1,10 @@ image: docker:latest stages: - - fabtest -# - build -# - test -## - deploy -# - clean - -fabtest: - stage: fabtest - script: - - fab test + - build + - test + - deploy + - clean #before_script: ## - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make @@ -38,21 +32,21 @@ test: when: always -#deploy-develop: -# stage: deploy -# only: -# - feature/develop_ci -# script: -# - fab --roles=develop deploy -# environment: -# name: Develop -# -# -##deploy-staging: -## stage: deploy -## only: -## - master -## script: -## - fab --roles=staging deploy -## environment: -## name: Staging +deploy-develop: + stage: deploy + only: + - feature/develop_ci + script: + - fab --roles=develop deploy + environment: + name: Develop + + +deploy-staging: + stage: deploy + only: + - master + script: + - fab --roles=staging deploy + environment: + name: Staging diff --git a/fabfile.py b/fabfile.py index c06e42d0..d49b2e03 100644 --- a/fabfile.py +++ b/fabfile.py @@ -2,10 +2,8 @@ import os # NOQA from fabric.api import * # NOQA -def test(): - print('Fab test') -user = 'gm' +user = 'gitlab-runner' env.roledefs = { 'develop': { From ed551ea1ab216e0bea679073b018dc29c05a3747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 12:14:21 +0300 Subject: [PATCH 24/44] add deploy --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 78bcc748..a4d335b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ buid: test: stage: test script: - - docker-compose -f compose-ci.yml run agro python manage.py test -v 3 --noinput + - docker-compose -f compose-ci.yml run gm_app python manage.py test -v 3 --noinput when: always From c1b51745186625cdf1a48a5e94b7cf6a76e0b775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 12:15:00 +0300 Subject: [PATCH 25/44] add deploy --- fabfile.py | 1 - 1 file changed, 1 deletion(-) diff --git a/fabfile.py b/fabfile.py index d49b2e03..6f300c37 100644 --- a/fabfile.py +++ b/fabfile.py @@ -31,7 +31,6 @@ def fetch(branch=None): with cd(env.src): role = env.roles[0] run('git pull origin {}'.format(env.roledefs[role]['branch'])) - run('git submodule update') def migrate(): From 239ebc1dd6e7fa6d9cfa1f7c75efb218ada6533a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 14:11:02 +0300 Subject: [PATCH 26/44] add deploy --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4d335b5..a617263b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,8 @@ buid: test: stage: test script: + - docker-compose -f compose-ci.yml run db up -d + - docker-compose -f compose-ci.yml run db down - docker-compose -f compose-ci.yml run gm_app python manage.py test -v 3 --noinput when: always From 05cccf85eab1e3d0702fabf06b0b86f90cc9e7c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 14:22:03 +0300 Subject: [PATCH 27/44] add deploy --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a617263b..36bfb0f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,6 +34,7 @@ test: when: always + deploy-develop: stage: deploy only: From 46fdf3e55d94a2efff19734656d9cc8210882517 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 15:15:03 +0300 Subject: [PATCH 28/44] delete celery, redis --- compose-ci.yml | 63 +------------------------------------------------- 1 file changed, 1 insertion(+), 62 deletions(-) diff --git a/compose-ci.yml b/compose-ci.yml index 83b20a44..b412e7a5 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -14,59 +14,6 @@ services: volumes: - gm-db:/var/lib/postgresql/data/ - elasticsearch: - image: elasticsearch:7.3.1 - volumes: - - gm-esdata:/usr/share/elasticsearch/data - hostname: elasticsearch - ports: - - 9200:9200 - - 9300:9300 - environment: - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" - - discovery.type=single-node - - xpack.security.enabled=false - - # Redis - redis: - image: redis:2.8.23 - ports: - - "6379:6379" - - # Celery - worker: - build: . - command: ./run_celery.sh - environment: - - SETTINGS_CONFIGURATION=local - - DB_NAME=postgres - - DB_USERNAME=postgres - - DB_HOSTNAME=db - - DB_PORT=5432 - - DB_PASSWORD=postgres - volumes: - - .:/code - links: - - db - - redis - - worker_beat: - build: . - command: ./run_celery_beat.sh - environment: - - SETTINGS_CONFIGURATION=local - - DB_NAME=postgres - - DB_USERNAME=postgres - - DB_HOSTNAME=db - - DB_PORT=5432 - - DB_PASSWORD=postgres - volumes: - - .:/code - links: - - db - - redis - - # App: G&M gm_app: build: . @@ -80,10 +27,6 @@ services: - DB_PASSWORD=postgres depends_on: - db - - redis - - worker - - worker_beat - - elasticsearch volumes: - .:/code - gm-media:/media-data @@ -92,9 +35,5 @@ services: volumes: gm-db: -# name: gm-db -# + gm-media: -# name: gm-media -# - gm-esdata: \ No newline at end of file From 9588c7cd881a61d92f85f7035d2ad31c09b669f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 15:35:23 +0300 Subject: [PATCH 29/44] delete celery, redis --- compose-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/compose-ci.yml b/compose-ci.yml index b412e7a5..f5697f6b 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -11,8 +11,8 @@ services: - POSTGRES_DB=postgres ports: - "5436:5432" - volumes: - - gm-db:/var/lib/postgresql/data/ +# volumes: +# - gm-db:/var/lib/postgresql/data/ # App: G&M gm_app: @@ -27,13 +27,13 @@ services: - DB_PASSWORD=postgres depends_on: - db - volumes: - - .:/code - - gm-media:/media-data +# volumes: +# - .:/code +# - gm-media:/media-data ports: - "8000:8000" -volumes: - gm-db: - - gm-media: +#volumes: +# gm-db: +# +# gm-media: From 7613f67f912571a2d7e54df950107ad38557148d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 15:44:58 +0300 Subject: [PATCH 30/44] delete celery, redis --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36bfb0f9..758a52f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ test: script: - docker-compose -f compose-ci.yml run db up -d - docker-compose -f compose-ci.yml run db down - - docker-compose -f compose-ci.yml run gm_app python manage.py test -v 3 --noinput + - docker-compose -f compose-ci.yml run gm_app python -B manage.py test -v 3 --noinput when: always From 052ff07ac7b8b9a825e53ce6e88f3c462a221a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 15:47:51 +0300 Subject: [PATCH 31/44] delete celery, redis --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 758a52f9..3c60aac4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: docker:latest +#image: docker:latest stages: - build From 5668da8e79e5da76ba1d10848997ea43b725389c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 16:03:50 +0300 Subject: [PATCH 32/44] delete celery, redis --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3c60aac4..758a52f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -#image: docker:latest +image: docker:latest stages: - build From 649fcc67935e42ec2c991585d76c21be7906d86c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 16:25:57 +0300 Subject: [PATCH 33/44] delete celery, redis --- compose-ci.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/compose-ci.yml b/compose-ci.yml index f5697f6b..a322ed56 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -11,8 +11,6 @@ services: - POSTGRES_DB=postgres ports: - "5436:5432" -# volumes: -# - gm-db:/var/lib/postgresql/data/ # App: G&M gm_app: @@ -27,13 +25,5 @@ services: - DB_PASSWORD=postgres depends_on: - db -# volumes: -# - .:/code -# - gm-media:/media-data ports: - "8000:8000" - -#volumes: -# gm-db: -# -# gm-media: From 1f44f21ede8e8f0a2394519a7b854dd864eb736f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 16:52:12 +0300 Subject: [PATCH 34/44] delete celery, redis --- .gitlab-ci.yml | 31 ++++++++++--------------------- fabfile.py | 11 ++--------- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 758a52f9..6d852c07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ image: docker:latest stages: - build - test - - deploy +# - deploy - clean #before_script: @@ -28,28 +28,17 @@ buid: test: stage: test script: - - docker-compose -f compose-ci.yml run db up -d - - docker-compose -f compose-ci.yml run db down + - docker-compose -f compose-ci.yml run db - docker-compose -f compose-ci.yml run gm_app python -B manage.py test -v 3 --noinput when: always -deploy-develop: - stage: deploy - only: - - feature/develop_ci - script: - - fab --roles=develop deploy - environment: - name: Develop - - -deploy-staging: - stage: deploy - only: - - master - script: - - fab --roles=staging deploy - environment: - name: Staging +#deploy-develop: +# stage: deploy +# only: +# - feature/develop_ci +# script: +# - fab --roles=develop deploy +# environment: +# name: Develop diff --git a/fabfile.py b/fabfile.py index 6f300c37..9ad7f871 100644 --- a/fabfile.py +++ b/fabfile.py @@ -3,19 +3,12 @@ from fabric.api import * # NOQA -user = 'gitlab-runner' +user = 'gm' env.roledefs = { 'develop': { 'branch': 'develop', - 'hosts': ['%s@rock.spider.ru:31' % user, ] - }, - 'staging': { - 'hosts': ['%s@5.200.53.99' % user, ] - }, - 'production': { - 'branch': 'master', - 'hosts': ['%s@87.226.166.80' % user, ] + 'hosts': ['%s@95.213.204.126' % user, ] } } From d1e40101b44f57f6953f508ada5bdd39558df0f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 16:59:11 +0300 Subject: [PATCH 35/44] delete celery, redis --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d852c07..75e0f8d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ buid: test: stage: test script: - - docker-compose -f compose-ci.yml run db + - docker-compose -f compose-ci.yml up db - docker-compose -f compose-ci.yml run gm_app python -B manage.py test -v 3 --noinput when: always From 40e64eafe71e146e6ff646eddc37895cec817030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 17:08:44 +0300 Subject: [PATCH 36/44] delete celery, redis --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75e0f8d4..fe878f7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,8 +28,8 @@ buid: test: stage: test script: - - docker-compose -f compose-ci.yml up db - - docker-compose -f compose-ci.yml run gm_app python -B manage.py test -v 3 --noinput +# - docker-compose -f compose-ci.yml build + - docker-compose -f compose-ci.yml run gm_app python manage.py test -v 3 --noinput when: always From 1092ec18847d15ac50227819a7077a8448638d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 17:24:21 +0300 Subject: [PATCH 37/44] delete celery, redis --- compose-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/compose-ci.yml b/compose-ci.yml index a322ed56..c2a154cd 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -12,6 +12,19 @@ services: ports: - "5436:5432" + elasticsearch: + image: elasticsearch:7.3.1 + volumes: + - gm-esdata:/usr/share/elasticsearch/data + hostname: elasticsearch + ports: + - 9200:9200 + - 9300:9300 + environment: + - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + - discovery.type=single-node + - xpack.security.enabled=false + # App: G&M gm_app: build: . @@ -25,5 +38,6 @@ services: - DB_PASSWORD=postgres depends_on: - db + - elasticsearch ports: - "8000:8000" From 2e99431bdd1d0a5eff78b561bd39dc31e94037ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 17:25:28 +0300 Subject: [PATCH 38/44] elastic --- compose-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/compose-ci.yml b/compose-ci.yml index c2a154cd..53ede064 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -14,8 +14,6 @@ services: elasticsearch: image: elasticsearch:7.3.1 - volumes: - - gm-esdata:/usr/share/elasticsearch/data hostname: elasticsearch ports: - 9200:9200 From 5a0ea251caa0ea69f7e5971f48bd5eae7adc0d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 17:35:33 +0300 Subject: [PATCH 39/44] elastic --- compose-ci.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/compose-ci.yml b/compose-ci.yml index 53ede064..66c767c4 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -23,6 +23,41 @@ services: - discovery.type=single-node - xpack.security.enabled=false + # Redis + redis: + image: redis:2.8.23 + ports: + - "6379:6379" + + # Celery + worker: + build: . + command: ./run_celery.sh + environment: + - SETTINGS_CONFIGURATION=local + - DB_NAME=postgres + - DB_USERNAME=postgres + - DB_HOSTNAME=db + - DB_PORT=5432 + - DB_PASSWORD=postgres + links: + - db + - redis + + worker_beat: + build: . + command: ./run_celery_beat.sh + environment: + - SETTINGS_CONFIGURATION=local + - DB_NAME=postgres + - DB_USERNAME=postgres + - DB_HOSTNAME=db + - DB_PORT=5432 + - DB_PASSWORD=postgres + links: + - db + - redis + # App: G&M gm_app: build: . From 18062e60a560c56976ab5cf16315b499b5979c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Wed, 23 Oct 2019 17:36:13 +0300 Subject: [PATCH 40/44] elastic --- compose-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/compose-ci.yml b/compose-ci.yml index 66c767c4..94079822 100644 --- a/compose-ci.yml +++ b/compose-ci.yml @@ -71,6 +71,9 @@ services: - DB_PASSWORD=postgres depends_on: - db + - redis + - worker + - worker_beat - elasticsearch ports: - "8000:8000" From f45f69e0e561828c4af907cc72e524356b9defbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 24 Oct 2019 09:47:29 +0300 Subject: [PATCH 41/44] add deploy --- .gitlab-ci.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe878f7f..94dda56d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,12 +3,9 @@ image: docker:latest stages: - build - test -# - deploy + - deploy - clean -#before_script: -## - apk add --update python python-dev py-pip gcc libc-dev libffi-dev openssl-dev make -# - pip install docker-compose clean: stage: clean @@ -28,17 +25,16 @@ buid: test: stage: test script: -# - docker-compose -f compose-ci.yml build - docker-compose -f compose-ci.yml run gm_app python manage.py test -v 3 --noinput when: always -#deploy-develop: -# stage: deploy -# only: -# - feature/develop_ci -# script: -# - fab --roles=develop deploy -# environment: -# name: Develop +deploy-develop: + stage: deploy + only: + - develop + script: + - fab --roles=develop deploy + environment: + name: Develop \ No newline at end of file From 0dde77a64b908f1761bf17da753509d80c5d5023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 24 Oct 2019 15:12:15 +0300 Subject: [PATCH 42/44] Fix search_index news --- apps/search_indexes/documents/news.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/search_indexes/documents/news.py b/apps/search_indexes/documents/news.py index 7cd69042..0d1cc765 100644 --- a/apps/search_indexes/documents/news.py +++ b/apps/search_indexes/documents/news.py @@ -42,8 +42,8 @@ class NewsDocument(Document): 'slug', 'state', 'is_highlighted', - 'image_url', - 'preview_image_url', + # 'image_url', + # 'preview_image_url', 'template', ) related_models = [models.NewsType] From df52c8a582d46ec0fd58bacf6ce19f2d17f1b8d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 24 Oct 2019 15:34:35 +0300 Subject: [PATCH 43/44] Add merged migrations --- .../account/migrations/0017_merge_20191024_1233.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 apps/account/migrations/0017_merge_20191024_1233.py diff --git a/apps/account/migrations/0017_merge_20191024_1233.py b/apps/account/migrations/0017_merge_20191024_1233.py new file mode 100644 index 00000000..580f6b2f --- /dev/null +++ b/apps/account/migrations/0017_merge_20191024_1233.py @@ -0,0 +1,14 @@ +# Generated by Django 2.2.4 on 2019-10-24 12:33 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('account', '0016_auto_20191024_0830'), + ('account', '0016_auto_20191024_0833'), + ] + + operations = [ + ] From 2cf0a94ccb36d251c67224fc141284a16a7e7f13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?= =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= Date: Thu, 24 Oct 2019 16:14:18 +0300 Subject: [PATCH 44/44] Fix migr --- .../migrations/0043_establishment_currency.py | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 apps/establishment/migrations/0043_establishment_currency.py diff --git a/apps/establishment/migrations/0043_establishment_currency.py b/apps/establishment/migrations/0043_establishment_currency.py new file mode 100644 index 00000000..7c324dc4 --- /dev/null +++ b/apps/establishment/migrations/0043_establishment_currency.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2.4 on 2019-10-24 13:13 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0022_auto_20191023_1113'), + ('establishment', '0042_establishment_tz'), + ] + + operations = [ + migrations.AddField( + model_name='establishment', + name='currency', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='main.Currency', verbose_name='currency'), + ), + ]