diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 318168d662b542dc1f81f7c7b28429a4e4c0a604..bc14d50b37e2a79fe4b19449e878c7dd17d23856 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,20 +126,20 @@ docker-push: - ./mvnw -ntp verify -Pprod -DskipTests -Dmaven.repo.local=$MAVEN_USER_HOME - ./mvnw -ntp jib:build -Pprod -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' -# 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: -# - 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: manual +deploy: + stage: deploy + dependencies: + - 'docker-push' + 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: + - 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: manual