diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a2f72ef16de8d20471ff2ef43e458ec41634094..56fd5d50a667453a7de4ef8221db2346cf2585e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ light-deploy-testing: <<: *ssh_setup environment: Testing script: - - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN "cd /home/apiserver/datacatalog && sudo git fetch --all && sudo git checkout -f $CI_COMMIT_TAG" + - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN "cd /home/apiserver/datacatalog && sudo git pull --all && sudo git checkout -f $CI_COMMIT_TAG" - ssh -oStrictHostKeyChecking=accept-new apiserver@$TESTING_DOMAIN "sudo /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $TESTING_URL $TESTING_DOMAIN" light-deploy-production: @@ -72,7 +72,7 @@ light-deploy-production: <<: *ssh_setup environment: Production script: - - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "cd /home/apiserver/datacatalog && sudo git fetch --all && sudo git checkout -f $CI_COMMIT_TAG" + - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "cd /home/apiserver/datacatalog && sudo git pull --all && sudo git checkout -f $CI_COMMIT_TAG" - ssh -oStrictHostKeyChecking=accept-new apiserver@$PRODUCTION_DOMAIN "sudo /home/apiserver/datacatalog/deploy_scripts/deployment.sh /home/apiserver/datacatalog $PRODUCTION_URL $PRODUCTION_DOMAIN" full-deploy-production: diff --git a/proxy_image/default_location b/proxy_image/default_location index ed060b3d1f999604fb6970393719319dcafdfc57..4c2332449123368c0038840b63cab929fec8e70c 100644 --- a/proxy_image/default_location +++ b/proxy_image/default_location @@ -1,5 +1,5 @@ location ~ \.(html|css|js|ico|jpg|jpeg|png|webp)$ { root /var/www/html/static/; - error_page 404 404.html + error_page 404 404.html; }