From da1984b27bd0e13d91708154dd2ecea73f915044 Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Tue, 24 May 2022 11:15:07 +0600 Subject: [PATCH 1/9] replace job deploy with remote template --- .gitlab-ci.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc3d450..e659ed4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,16 @@ stages: - deploy +include: + - project: 'e/infra/selfhost/nextcloud-apps/ci-templates' + ref: dev/template + file: 'auto-deploy-pipelines.yml' + .deploy:nextcloud-app: - image: ubuntu:focal stage: deploy - before_script: - - mkdir $HOME/.ssh - - chmod 700 ~/.ssh - - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519 - - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub - - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts - - chmod 600 ~/.ssh/id_ed25519 - - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub - - apt-get update && apt-get install -y openssh-client rsync script: + # overriding script as all it needs is clone, copy and chown + # print var to confirm - echo "Deploying to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)" - ssh $SSH_USER@$DEPLOYMENT_HOST "git clone --depth 1 $CI_REPOSITORY_URL --branch $DEPLOYMENT_BRANCH --single-branch /tmp/${CI_JOB_ID}/rainloop && sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/rainloop ${DEPLOYMENT_PATH}/html/custom_apps/ && rm -rf /tmp/${CI_JOB_ID} && rm -rf ${DEPLOYMENT_PATH}/data/rainloop-storage/_data_/_default_/cache/*" -- GitLab From e563fe50452b7b363bfff4fcc4d826402bfa851e Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Tue, 24 May 2022 11:16:08 +0600 Subject: [PATCH 2/9] remove extended deploy jobs --- .gitlab-ci.yml | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e659ed4..46b2d26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,30 +12,4 @@ include: # overriding script as all it needs is clone, copy and chown # print var to confirm - echo "Deploying to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)" - - ssh $SSH_USER@$DEPLOYMENT_HOST "git clone --depth 1 $CI_REPOSITORY_URL --branch $DEPLOYMENT_BRANCH --single-branch /tmp/${CI_JOB_ID}/rainloop && sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/rainloop ${DEPLOYMENT_PATH}/html/custom_apps/ && rm -rf /tmp/${CI_JOB_ID} && rm -rf ${DEPLOYMENT_PATH}/data/rainloop-storage/_data_/_default_/cache/*" - -deploy:dev01: - extends: .deploy:nextcloud-app - when: manual - only: - - /^dev\/.*$/ - environment: - name: dev/01 - url: https://dev.eeo.one/ - variables: - DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH - CONTAINER_NAME: dev01_nextcloud - -deploy:staging: - extends: .deploy:nextcloud-app - when: manual - only: - - production - - ecloud-main - environment: - name: staging/01 - url: https://eeo.one - variables: - DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH - CONTAINER_NAME: nextcloud - + - ssh $SSH_USER@$DEPLOYMENT_HOST "git clone --depth 1 $CI_REPOSITORY_URL --branch $DEPLOYMENT_BRANCH --single-branch /tmp/${CI_JOB_ID}/rainloop && sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/rainloop ${DEPLOYMENT_PATH}/html/custom_apps/ && rm -rf /tmp/${CI_JOB_ID} && rm -rf ${DEPLOYMENT_PATH}/data/rainloop-storage/_data_/_default_/cache/*" \ No newline at end of file -- GitLab From e3099a21bbae75ed12d5b9aea3ab13af6ab33fd4 Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Tue, 24 May 2022 11:19:01 +0600 Subject: [PATCH 3/9] fix project path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46b2d26..72db4ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ stages: - deploy include: - - project: 'e/infra/selfhost/nextcloud-apps/ci-templates' + - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' ref: dev/template file: 'auto-deploy-pipelines.yml' -- GitLab From 679f1d7affe64b82274258834834db7f461063aa Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Tue, 24 May 2022 20:14:23 +0600 Subject: [PATCH 4/9] fix project path and file --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72db4ca..17e6979 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,9 +2,9 @@ stages: - deploy include: - - project: 'e/infra/ecloud/nextcloud-apps/ci-templates' - ref: dev/template - file: 'auto-deploy-pipelines.yml' + - project: "e/infra/ecloud/nextcloud-apps/ci-templates" + ref: dev/template + file: "nc-apps-deploy.yml" .deploy:nextcloud-app: stage: deploy -- GitLab From 1212dd293b877d1a63e9f1b0433e29ec997e3f5a Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Wed, 25 May 2022 14:55:09 +0600 Subject: [PATCH 5/9] add checkout deployment --- .gitlab-ci.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17e6979..7f3c0eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,13 +3,9 @@ stages: include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" - ref: dev/template - file: "nc-apps-deploy.yml" + ref: dev/nc-apps-checkout-deploy + file: "nc-apps-checkout-deploy.yml" -.deploy:nextcloud-app: - stage: deploy - script: - # overriding script as all it needs is clone, copy and chown - # print var to confirm - - echo "Deploying to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)" - - ssh $SSH_USER@$DEPLOYMENT_HOST "git clone --depth 1 $CI_REPOSITORY_URL --branch $DEPLOYMENT_BRANCH --single-branch /tmp/${CI_JOB_ID}/rainloop && sudo rsync -avzh --chown www-data:www-data --delete --exclude '.git*' /tmp/${CI_JOB_ID}/rainloop ${DEPLOYMENT_PATH}/html/custom_apps/ && rm -rf /tmp/${CI_JOB_ID} && rm -rf ${DEPLOYMENT_PATH}/data/rainloop-storage/_data_/_default_/cache/*" \ No newline at end of file +.deploy:nextcloud-app-by-checkout: + stage: deploy + variables: -- GitLab From 93e56a9814e7e8c215b6840bfc9065eab6e2d887 Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Thu, 26 May 2022 19:15:47 +0600 Subject: [PATCH 6/9] change include ref --- .gitlab-ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f3c0eb..bb202f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,11 +1,4 @@ -stages: - - deploy - include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" - ref: dev/nc-apps-checkout-deploy - file: "nc-apps-checkout-deploy.yml" - -.deploy:nextcloud-app-by-checkout: - stage: deploy - variables: + ref: main + file: "nc-apps-checkout-deploy.yml" \ No newline at end of file -- GitLab From 6ddd29a994dacaef9deb7482041b1d3066a90361 Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Thu, 26 May 2022 19:19:19 +0600 Subject: [PATCH 7/9] add APP_NAME var --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb202f0..ce5894a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,7 @@ +variables: + APP_NAME: rainloop include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main - file: "nc-apps-checkout-deploy.yml" \ No newline at end of file + file: "nc-apps-checkout-deploy.yml" + \ No newline at end of file -- GitLab From b58e795ca7dda5fa67d9c11708835b0821f3499a Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Tue, 31 May 2022 16:12:32 +0600 Subject: [PATCH 8/9] new line --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce5894a..cd5b53b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,4 +4,3 @@ include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main file: "nc-apps-checkout-deploy.yml" - \ No newline at end of file -- GitLab From 59661d1b5d9ce792e51494c542c2f8bb69dd3ad6 Mon Sep 17 00:00:00 2001 From: Fazle Rabbi Date: Tue, 7 Jun 2022 13:56:48 +0600 Subject: [PATCH 9/9] add after_script to remove cache --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd5b53b..bc73521 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,3 +4,7 @@ include: - project: "e/infra/ecloud/nextcloud-apps/ci-templates" ref: main file: "nc-apps-checkout-deploy.yml" + +.deploy:nextcloud-app-by-checkout: + after_script: + - rm -rf ${DEPLOYMENT_PATH}/data/rainloop-storage/_data_/_default_/cache/* -- GitLab