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

Verified Commit 5fe08a0e authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

fix prod deployment job

parent 455a936c

.gitlab-ci.yml

+5 −5
Original line number Original line Diff line number Diff line
@@ -65,7 +65,7 @@ test:unit: 
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

  script:

  script:

    - echo "Deploying to ($SSH_USER@$BACKEND_HOST)"

    - echo "Deploying to ($SSH_USER@$BACKEND_HOST)"

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git fetch && git checkout $BRANCH && git reset --hard origin/$BRANCH && rm .env .env.prod && rm docker-compose.yml && mv docker-compose.prod.yml docker-compose.yml"

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH && git stash && git fetch && git checkout $SPOT_COMMIT && git reset --hard && mv docker-compose.prod.yml docker-compose.yml"

    - scp $ENV_FILE $SSH_USER@$BACKEND_HOST:$DEPLOYMENT_PATH/.env

    - scp $ENV_FILE $SSH_USER@$BACKEND_HOST:$DEPLOYMENT_PATH/.env

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH

    - ssh $SSH_USER@$BACKEND_HOST "cd $DEPLOYMENT_PATH

      && sed -i 's/SPOT_DOCKER_TAG=master/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env

      && sed -i 's/SPOT_DOCKER_TAG=master/SPOT_DOCKER_TAG=$SPOT_DOCKER_TAG/g' .env
@@ -84,7 +84,7 @@ deploy:spot.murenatest.io.backend1: 
  variables:

  variables:

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    BRANCH: ${CI_COMMIT_REF_NAME}

    SPOT_COMMIT: ${CI_COMMIT_REF_NAME}





deploy:spot.murenatest.io.backend2:

deploy:spot.murenatest.io.backend2:

  extends: .deploy:template

  extends: .deploy:template
@@ -99,7 +99,7 @@ deploy:spot.murenatest.io.backend2: 
  variables:

  variables:

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    BRANCH: ${CI_COMMIT_REF_NAME}

    SPOT_COMMIT: ${CI_COMMIT_REF_NAME}





deploy:spot.murena.io.backend1:

deploy:spot.murena.io.backend1:

  extends: .deploy:template

  extends: .deploy:template
@@ -113,7 +113,7 @@ deploy:spot.murena.io.backend1: 
  variables:

  variables:

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    BRANCH: master

    SPOT_COMMIT: ${CI_COMMIT_TAG}





deploy:spot.murena.io.backend2:

deploy:spot.murena.io.backend2:

  extends: .deploy:template

  extends: .deploy:template
@@ -127,4 +127,4 @@ deploy:spot.murena.io.backend2: 
  variables:

  variables:

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    DOCKER_HOST: ssh://${SSH_USER}@${BACKEND_HOST}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    SPOT_DOCKER_TAG: ${CI_COMMIT_REF_SLUG}

    BRANCH: master
 
    SPOT_COMMIT: ${CI_COMMIT_TAG}