Merge remote-tracking branch 'origin/master'

This commit is contained in:
Alejandro Matos
2021-05-21 01:08:24 -05:00
+4 -4
View File
@@ -12,7 +12,7 @@ stages:
maven-package:
stage: package
script:
- ./mvnw verify -Dmaven.repo.local=$MAVEN_USER_HOME
- ./mvnw clean install -Dmaven.repo.local=$MAVEN_USER_HOME
artifacts:
paths:
- target/*.jar
@@ -28,7 +28,7 @@ docker-push:
REGISTRY_URL: registry.gitlab.com
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
IMAGE_TAG: $CI_REGISTRY_IMAGE:master
stage: release
dependencies:
- maven-package
@@ -47,8 +47,8 @@ docker-run:
before_script:
- apk add openssh-client
- mkdir -p ~/.ssh
- echo "$DEPLOY_SERVER_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
- chmod 600 ~/.ssh/id_rsa
- echo "$PRIVATE_VEY" | tr -d '\r' > ~/.ssh/id_rsa
- chmod 700 ~/.ssh/id_rsa
- eval "$(ssh-agent -s)"
- ssh-add ~/.ssh/id_rsa
- ssh-keyscan -H $DEPLOYMENT_SERVER_IP >> ~/.ssh/known_hosts