From 2321a0613d44f0cb6fe5d09ffc6b014054ad13c0 Mon Sep 17 00:00:00 2001 From: nivesh Date: Wed, 10 Nov 2021 00:21:14 +0530 Subject: [PATCH 1/6] git switch branch in staging --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1baa18f2..d4830fb79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ deploy:spot.eeo.one.backend1: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env @@ -136,7 +136,7 @@ deploy:spot.eeo.one.backend2: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env -- GitLab From 35f65b35680870b0717c809a49d2c0c13e2f750b Mon Sep 17 00:00:00 2001 From: nivesh Date: Wed, 10 Nov 2021 00:59:58 +0530 Subject: [PATCH 2/6] attempt to clean install the repo --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4830fb79..7f38935c0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ deploy:spot.eeo.one.backend1: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env @@ -136,7 +136,7 @@ deploy:spot.eeo.one.backend2: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git switch -c $CI_COMMIT_BRANCH && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env -- GitLab From 3b782c1ae0390a9765b35dda37960d69131d0ecd Mon Sep 17 00:00:00 2001 From: nivesh Date: Wed, 10 Nov 2021 01:14:40 +0530 Subject: [PATCH 3/6] fix git clone --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f38935c0..9d0e3795a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ deploy:spot.eeo.one.backend1: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env @@ -136,7 +136,7 @@ deploy:spot.eeo.one.backend2: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation:e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env -- GitLab From 2027876bda82c1f859cf24fa4c26d861ef5330b6 Mon Sep 17 00:00:00 2001 From: nivesh Date: Wed, 10 Nov 2021 12:01:03 +0530 Subject: [PATCH 4/6] run dokcer build only for master --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d0e3795a..d7e68426e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,6 +23,8 @@ build:web: script: - ./manage themes.etheme - ./manage babel.compile + only: + - master .build:docker: stage: build -- GitLab From fbe0d31ca0cd8d2da300ecca503fe509b4bc478d Mon Sep 17 00:00:00 2001 From: nivesh Date: Thu, 11 Nov 2021 09:47:59 +0530 Subject: [PATCH 5/6] push to registry for all branches --- .gitlab-ci.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7e68426e..0c512d2b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,6 @@ build:web: script: - ./manage themes.etheme - ./manage babel.compile - only: - - master .build:docker: stage: build @@ -39,10 +37,8 @@ build:web: - docker build -t $CI_REGISTRY_IMAGE/nginx -f nginx.Dockerfile . - docker push $CI_REGISTRY_IMAGE/nginx -build:docker:master: +build:docker: extends: .build:docker - only: - - master build:docker:tags: extends: .build:docker @@ -98,7 +94,7 @@ deploy:spot.eeo.one.backend1: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND1_HOST - $BACKEND1_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND1_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env @@ -112,7 +108,7 @@ deploy:spot.eeo.one.backend1: && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env - && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d --build" + && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d" deploy:spot.eeo.one.backend2: extends: .deploy:template @@ -138,7 +134,7 @@ deploy:spot.eeo.one.backend2: MORTY_PORT: 8089 script: - echo "Deploying to $CI_ENVIRONMENT_NAME ($SSH_USER@$BACKEND2_HOST - $BACKEND2_WG_IP - $WIREGUARD_IP)" - - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/ && rm -rf staging-spot && git clone --single-branch --branch $CI_COMMIT_REF_NAME https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.e.foundation/e/cloud/my-spot.git staging-spot && cd staging-spot && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" + - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && git reset --hard && git clean -xfdf && git pull && rm .env && mv .env.prod .env && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml" - ssh $SSH_USER@$BACKEND2_HOST "cd /mnt/repo-base/staging-spot && sed -i 's/SPOT_HOSTNAME=spot.ecloud.global/SPOT_HOSTNAME=$SPOT_HOSTNAME/g' .env && sed -i 's/SPOT_MORTY_HOSTNAME=proxy.spot.ecloud.global/SPOT_MORTY_HOSTNAME=$SPOT_MORTY_HOSTNAME/g' .env @@ -152,7 +148,7 @@ deploy:spot.eeo.one.backend2: && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env - && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d --build" + && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d" deploy:spot.ecloud.global.backend1: extends: .deploy:template -- GitLab From 749e78c52fa99d33a0b16c86dd072324439ba989 Mon Sep 17 00:00:00 2001 From: nivesh Date: Thu, 11 Nov 2021 09:57:09 +0530 Subject: [PATCH 6/6] add in build --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c512d2b8..7b5fe3a8a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,10 +32,10 @@ build:web: before_script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - - docker build -t $CI_REGISTRY_IMAGE . - - docker push $CI_REGISTRY_IMAGE - - docker build -t $CI_REGISTRY_IMAGE/nginx -f nginx.Dockerfile . - - docker push $CI_REGISTRY_IMAGE/nginx + - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG . + - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG + - docker build -t $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG -f nginx.Dockerfile . + - docker push $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG build:docker: extends: .build:docker -- GitLab