Merge branch 'testing_production_documentation' into...

Merge branch 'testing_production_documentation' into '156-login-not-working-when-clicking-on-redirect-link'

Testing production documentation

See merge request sharing/codeability-sharing-platform!139

.gitlab-ci.yml

@@ -15,6 +15,8 @@ stages:
   - release
   - deploy
   - e2e
+  - releaseProd
+  - deployProd
 
 before_script:
   - export NG_CLI_ANALYTICS="false"
@@ -137,7 +139,7 @@ deploy:
   cache: []
   # only:
   #   refs:
-  #     - development
+  #     - master
   dependencies:
     - docker-build
   before_script:
@@ -151,7 +153,52 @@ deploy:
     REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
     IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch/$CI_COMMIT_REF_NAME
   script:
-    - ssh contDeploy@codeability-austria -p 1022 "cd gitsearch2/gitsearch && git pull && cd src/main/docker/ && docker pull $IMAGE_TAG && GIT_BRANCH=$CI_COMMIT_REF_NAME COMMIT_ID=`git rev-parse HEAD` SPRING_PROFILES_ACTIVE=staging,swagger docker-compose -f gitsearch.yml up  -d --no-deps --build --force-recreate gitsearch-app && exit"
+    - ssh contDeploy@codeability-austria -p 1022 "export GITBRANCH=$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 && cd src/main/docker/ && docker pull $IMAGE_TAG && GIT_BRANCH=$CI_COMMIT_REF_NAME COMMIT_ID=`git rev-parse HEAD` SPRING_PROFILES_ACTIVE=staging,swagger docker-compose -f gitsearch.yml up  -d --no-deps --build --force-recreate gitsearch-app && exit"
+  when: manual
+
+docker-buildProd:
+  stage: releaseProd
+  cache: []
+  only:
+    refs:
+      - master
+  dependencies:
+    - maven-test
+    - frontend-test
+  before_script:
+    - mkdir -p ~/.ssh
+    - echo "${SSH_BKY_DEPLOY_PROD}" > ~/.ssh/id_rsa
+    - chmod 700 ~/.ssh/id_rsa
+    - eval "$(ssh-agent -s)"
+    - ssh-add ~/.ssh/id_rsa
+    - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+  variables:
+    REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
+    IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch/$CI_COMMIT_REF_NAME
+  script:
+    - ssh contDeploy@codeability -p 1022 "cd gitsearch2/codeability-sharing-platform && git checkout $CI_COMMIT_REF_NAME && git pull && ./mvnw -Pprod package -DskipTests jib:build -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME"
+  when: manual
+
+deployProd:
+  stage: deployProd
+  cache: []
+  only:
+    refs:
+      - master
+  dependencies:
+    - docker-buildProd
+  before_script:
+    - mkdir -p ~/.ssh
+    - echo "${SSH_BKY_DEPLOY_PROD}" > ~/.ssh/id_rsa
+    - chmod 700 ~/.ssh/id_rsa
+    - eval "$(ssh-agent -s)"
+    - ssh-add ~/.ssh/id_rsa
+    - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
+  variables:
+    REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
+    IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch/$CI_COMMIT_REF_NAME
+  script:
+    - ssh contDeploy@codeability -p 1022 "export GITBRANCH=$CI_COMMIT_REF_NAME && export COMMIT_DATE=$(git show -s --format=%ct $CI_COMMIT_SHA) && cd gitsearch2/codeability-sharing-platform && git fetch && git stash && git checkout $CI_COMMIT_REF_NAME && git pull && cd src/main/docker/ && docker pull $IMAGE_TAG && GIT_BRANCH=$CI_COMMIT_REF_NAME COMMIT_ID=`git rev-parse HEAD` SPRING_PROFILES_ACTIVE=staging,swagger docker-compose -f gitsearch.yml up  -d --no-deps --build --force-recreate gitsearch-app && exit"
   when: manual
 
 e2e-test:

src/main/docker/gitsearch.yml

 version: '3.5'
 services:
   gitsearch-app:
-    image: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch
+    image: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/gitsearch/$GITBRANCH
     container_name: sharing_search
     hostname: sharing_search
     environment: