testing

.gitlab-ci.yml

@@ -135,7 +135,7 @@ sonar-analyze:
 # 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
-  image: maven:3.8-openjdk-11
+  cache: []
   # only:
   #   refs:
   #     - development
@@ -145,10 +145,13 @@ docker-push:
   variables:
     REGISTRY_URL: sharing-codeability.uibk.ac.at:5051
     IMAGE_TAG: sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
+  before_script:
+    - export NG_CLI_ANALYTICS="false"
+    - export MAVEN_USER_HOME=`pwd`/.maven
+    - npm ci --cache .npm --prefer-offline
   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
+    - ./mvnw package -Pprod -Dskip.installnodenpm 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: on_success
-  cache: []
 
 deploy:
   stage: deploy
@@ -160,10 +163,7 @@ deploy:
     - docker-push
     - maven-test
     - frontend-test
-  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
@@ -171,7 +171,6 @@ deploy:
     - ssh-add ~/.ssh/id_rsa
     - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
   script:
-    - npm cache verify
     - 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: on_success
 

src/main/docker/gitlabCI/customJHipster/Dockerfile

@@ -4,4 +4,4 @@ USER root
 
 ARG VERSION=6.40.0
 
-RUN apt update && apt install -y default-jre xvfb zip wget ca-certificates libnss3-dev libasound2 libxss1 libappindicator3-1 libindicator7 gconf-service libgconf-2-4 libpango1.0-0 xdg-utils fonts-liberation libgbm1 bash
\ No newline at end of file
+RUN apt update && apt install -y default-jre xvfb zip wget ca-certificates libnss3-dev libasound2 libxss1 libappindicator3-1 libindicator7 gconf-service libgconf-2-4 libpango1.0-0 xdg-utils fonts-liberation libgbm1 bash rsync openssh-client

src/main/docker/gitlabCI/customJHipster/readme.md

@@ -4,8 +4,8 @@ docker login sharing-codeability.uibk.ac.at:5051
 
 # Step 2
 
-docker build -t sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform .
+docker build -t sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/root-jhipster .
 
 # Step 3
 
-docker push sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform
+docker push sharing-codeability.uibk.ac.at:5051/sharing/codeability-sharing-platform/root-jhipster