int deploy

.gitlab-ci.yml

@@ -9,11 +9,11 @@ stages:
   # - lint
   # - build
   # - test
-  - e2e
+  # - e2e
   # - analyze
   # - package
-  # - release
-  # - deploy
+  - release
+  - deploy
 
 before_script:
   - export NG_CLI_ANALYTICS="false"
@@ -102,19 +102,19 @@ before_script:
 #     expire_in: 15 days
 #   needs: []
 
-e2e-test:
-  services:
-    - selenium/standalone-chrome
-  image: node
-  stage: e2e
-  cache: {}
-  # dependencies:
-  #   - frontend-test
-  script:
-    - apt-get update
-    - apt-get install -y default-jre
-    - apt-get -f install
-    - npm run e2e
+# e2e-test:
+#   services:
+#     - selenium/standalone-chrome
+#   image: node
+#   stage: e2e
+#   cache: {}
+#   # dependencies:
+#   #   - frontend-test
+#   script:
+#     - apt-get update
+#     - apt-get install -y default-jre
+#     - apt-get -f install
+#     - npm run e2e
 # sonar-analyze:
 #   stage: analyze
 #   dependencies:
@@ -131,33 +131,33 @@ e2e-test:
 #     - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME
 
 # Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
-# docker-push:
-#   stage: release
-#   variables:
-#     # only:
-#     #   refs:
-#     #     - development
-#     REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
-#     IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
-#   script:
-#     - ./mvnw package -Pprod verify -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: always
+docker-push:
+  stage: release
+  variables:
+    # only:
+    #   refs:
+    #     - development
+    REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
+    IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
+  script:
+    - ./mvnw package -Pprod verify -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: always
 
-# deploy:
-#   stage: deploy
-#   dependencies:
-#     - 'docker-push'
-#   image: ubuntu:20.04
-#   before_script:
-#     - apt-get update -qy
-#     - apt-get install -y rsync openssh-client
-#     - mkdir -p ~/.ssh
-#     - echo "${SSH_BKY_DEPLOY}" > ~/.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
-#   script:
-#     - whoami
-#     - ssh contDeploy@codeability-austria -p 1022 "cd /home/michael/gitsearch && git pull && cd src/main/docker/ && docker pull sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform && GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` 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: always
+deploy:
+  stage: deploy
+  dependencies:
+    - 'docker-push'
+  image: ubuntu:20.04
+  before_script:
+    - apt-get update -qy
+    - apt-get install -y rsync openssh-client
+    - mkdir -p ~/.ssh
+    - echo "${SSH_BKY_DEPLOY}" > ~/.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
+  script:
+    - whoami
+    - ssh contDeploy@codeability-austria -p 1022 "cd /home/michael/gitsearch && git pull && cd src/main/docker/ && docker pull sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform && GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` 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: always

src/main/webapp/index.html

@@ -113,17 +113,15 @@
     </noscript>
     <script type="text/javascript">
       // show an error message if the app loading takes more than 4 sec
-      this.ngZone.runOutsideAngular(() => {
-        window.onload = function () {
-          setTimeout(showError, 4000);
-        };
-        function showError() {
-          var errorElm = document.getElementById('jhipster-error');
-          if (errorElm && errorElm.style) {
-            errorElm.style.display = 'block';
-          }
+      window.onload = function () {
+        setTimeout(showError, 4000);
+      };
+      function showError() {
+        var errorElm = document.getElementById('jhipster-error');
+        if (errorElm && errorElm.style) {
+          errorElm.style.display = 'block';
         }
-      });
+      }
     </script>
   </body>
 </html>