Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28020efd authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

Merge branch 'fix-staging-pipeline' into 73-bing-safesearch

parents 969120b0 749e78c5

.gitlab-ci.yml

+9 −11
Original line number Diff line number Diff line
@@ -32,15 +32,13 @@ 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:master:

build:docker:

  extends: .build:docker

  only:

    - master



build:docker:tags:

  extends: .build:docker
@@ -96,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
@@ -110,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
@@ -136,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
@@ -150,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