From 2a205392032eee4d1df7e5df04e8f220e6d196b8 Mon Sep 17 00:00:00 2001
From: Michael Breu <Michael.Breu@arctis.at>
Date: Tue, 23 Jan 2024 13:05:11 +0100
Subject: [PATCH] Improving deployment
---
.gitlab-ci.yml | 2 +-
manual_deploy.sh | 4 ++--
.../service/gitlab_events/metaData_elasticSearch.schema.json | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a916df625..953f6256a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,7 +145,7 @@ deploy:
REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/development/sharing/codeability-sharing-platform/gitsearch/$CI_COMMIT_REF_NAME
script:
- - ssh contDeploy@codeability-austria -p 1022 "export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME && export COMMIT_DATE=$(git show -s --format=%ct $CI_COMMIT_SHA) && cd gitsearch2/gitsearch && git fetch && git stash && git checkout $CI_COMMIT_REF_NAME && git pull && ./manual_deploy.sh && exit"
+ - ssh contDeploy@codeability-austria -p 1022 "export CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME && export COMMIT_DATE=$(git show -s --format=%ct $CI_COMMIT_SHA) && export GITSEARCH_PATH=${GITSEARCH_PATH} && cd gitsearch2/gitsearch && git fetch && git stash && git checkout $CI_COMMIT_REF_NAME && git pull && ./manual_deploy.sh && exit"
when: manual
deployProd:
diff --git a/manual_deploy.sh b/manual_deploy.sh
index 68512f3a1..afbab0850 100755
--- a/manual_deploy.sh
+++ b/manual_deploy.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-echo "Deploying Gitsearch"
+echo "Deploying Gitsearch in directory ${GITSEARCH_PATH}"
if [[ -z "${CI_COMMIT_REF_NAME}" ]]; then
@@ -16,7 +16,7 @@ else
source /home/contDeploy/gitsearch2/gitsearch/src/main/docker/.env
else
# Handle other branches or provide a default
- echo "Using default or other branch settings"
+ echo "Using default or other branch settings for ${GITBRANCH}"
fi
echo "Deploying via pipeline"
diff --git a/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json b/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json
index 0b9ecd2e9..d4498a47b 100644
--- a/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json
+++ b/src/main/resources/at/ac/uibk/gitsearch/service/gitlab_events/metaData_elasticSearch.schema.json
@@ -1,7 +1,7 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Metadata",
- "description": "A metadata description of a repository",
+ "description": "A metadata description of a repository. This is used for syntax checking of incoming meta data.",
"type": "object",
"properties": {
"assesses": {
--
GitLab