diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37bbcf8ed19a0b4e375ac0edd86ae7fa2fb9944b..197e32b035a680dd27f67d09e78594b5141f6a25 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