From 29c49bba880394c545bd8963f7021d43a83c4e23 Mon Sep 17 00:00:00 2001
From: Eduard Frankford <e.frankford@student.uibk.ac.at>
Date: Sun, 22 May 2022 12:33:29 +0200
Subject: [PATCH] try ubuntu image

---
 .gitlab-ci.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37bbcf8ed..197e32b03 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: ubuntu:latest
+image: jhipster/jhipster:latest
 
 cache:
   key: '$CI_COMMIT_REF_NAME'
@@ -16,16 +16,6 @@ stages:
 before_script:
   - export NG_CLI_ANALYTICS="false"
   - export MAVEN_USER_HOME=`pwd`/.maven
-  - whoami
-  - 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
-  - echo "Hello world"
 
 # pmdCheckstylePrettierLint:
 #   stage: lint
@@ -140,6 +130,17 @@ deploy:
   stage: deploy
   # dependencies:
   #   - 'docker-push'
+  image: ubuntu
   script:
+    - whoami
+    - 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
+    - echo "Hello world"
     - ssh contDeploy@codeability-austria -p 1022 -f "(cd /home/michael/gitsearch git pull && cd src/main/docker/; 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 gitsearch-app)"
   when: always
-- 
GitLab