From 09f1f597ac6f1fab56f6cbfd44fb699026fbed50 Mon Sep 17 00:00:00 2001
From: Christian Boettcher <c.boettcher@fz-juelich.de>
Date: Wed, 17 Nov 2021 09:16:36 +0100
Subject: [PATCH] fix possible isues with the light deployment process
---
.gitlab-ci.yml | 4 ++--
proxy_image/default_location | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a2f72e..56fd5d5 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 ed060b3..4c23324 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;
}
--
GitLab