diff --git a/gitlab-ci.yml b/gitlab-ci.yml index fe35fb430afa5212b48512af03e5832c2c6b60a8..9693e5a30fa547071905fbce3eaff512ae920117 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -4,10 +4,12 @@ variables: GIT_STRATEGY: fetch PRODUCTION_SHOPIFY_API_KEY: "" PRODUCTION_DEPLOY_HOST: s125.cyber-folks.pl + PRODUCTION_DEPLOY_PORT: 222 PRODUCTION_DEPLOY_USER: wlgmnfabmq PRODUCTION_DEPLOY_DIR: "" STAGE_SHOPIFY_API_KEY: "" STAGE_DEPLOY_HOST: s125.cyber-folks.pl + STAGE_DEPLOY_PORT: 222 STAGE_DEPLOY_USER: wlgmnfabmq STAGE_DEPLOY_DIR: "" RUN_AFTER_DEPLOY: "pwd" @@ -53,9 +55,9 @@ stages: - if [ "$DEPLOY_USER" ] == "" ]; then echo "DEPLOY_USER is empty" ; exit 1; fi - if [ "$DEPLOY_DIR" ] == "" ]; then echo "DEPLOY_DIR is empty" ; exit 1; fi - ls -al - - ssh-keyscan -H -p 222 $DEPLOY_HOST >> ~/.ssh/known_hosts - - rsync -v --delete -rlDe 'ssh -p 222 -v -i ~/.ssh/id_rsa_demo_fs' --exclude-from=.distignore ${CI_PROJECT_DIR}/web/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR - - ssh -p 222 -i ~/.ssh/id_rsa_demo_fs $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_DIR && mv frontend/dist/assets/ public/ && mv frontend/dist/index.html public/index.html && php82 bin/console doctrine:migrations:migrate --no-interaction && php82 bin/console cache:clear && $RUN_AFTER_DEPLOY" + - ssh-keyscan -H -p $DEPLOY_PORT $DEPLOY_HOST >> ~/.ssh/known_hosts + - rsync -v --delete -rlDe 'ssh -p $DEPLOY_PORT -v -i ~/.ssh/id_rsa_demo_fs' --exclude-from=.distignore ${CI_PROJECT_DIR}/web/ $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_DIR + - ssh -p $DEPLOY_PORT -i ~/.ssh/id_rsa_demo_fs $DEPLOY_USER@$DEPLOY_HOST "cd $DEPLOY_DIR && mv frontend/dist/assets/ public/ && mv frontend/dist/index.html public/index.html && php82 bin/console doctrine:migrations:migrate --no-interaction && php82 bin/console cache:clear && $RUN_AFTER_DEPLOY" after_script: - $DEPLOY_AFTER_SCRIPT @@ -63,6 +65,7 @@ stages: <<: *deploy-template variables: DEPLOY_HOST: $STAGE_DEPLOY_HOST + DEPLOY_PORT: $STAGE_DEPLOY_PORT DEPLOY_USER: $STAGE_DEPLOY_USER DEPLOY_DIR: $STAGE_DEPLOY_DIR dependencies: @@ -73,6 +76,7 @@ stages: <<: *deploy-template variables: DEPLOY_HOST: $PRODUCTION_DEPLOY_HOST + DEPLOY_PORT: $PRODUCTION_DEPLOY_PORT DEPLOY_USER: $PRODUCTION_DEPLOY_USER DEPLOY_DIR: $PRODUCTION_DEPLOY_DIR dependencies: