From d1fe7ba50876433bb21a3c6034de7256846ec141 Mon Sep 17 00:00:00 2001 From: Henri Burau Date: Wed, 25 Mar 2020 14:03:27 +0100 Subject: [PATCH] Ci change --- .gitlab-ci.yml | 31 +++++++++++-------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 93597ea..7af1873 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,23 +21,14 @@ create_image: - docker tag $SERVICE_NAME:latest $DOCKER_REGISTRY/$CI_PROJECT_NAMESPACE/$SERVICE_NAME:latest - docker push $DOCKER_REGISTRY/$CI_PROJECT_NAMESPACE/$SERVICE_NAME:latest -deploy_docker: - variables: - DOCKER_HOST: "ssh://pi@henriburau.de" - stage: deploy - image: ubuntu - only: - - release - tags: - - docker - before_script: - - 'which ssh-agent || ( apt update -y && apt install openssh-client -y )' - - eval $(ssh-agent -s) - - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - - - mkdir -p ~/.ssh - - chmod 700 ~/.ssh - script: - - ssh $DOCKER_HOST 'docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $DOCKER_REGISTRY' - - ssh $DOCKER_HOST 'docker service ps $DOCKER_SERVICE_NAME &> /dev/null || lan-docker service create --name $DOCKER_SERVICE_NAME --publish 8081:8080 $DOCKER_REGISTRY/$CI_PROJECT_NAMESPACE/$SERVICE_NAME:latest' - - ssh $DOCKER_HOST 'docker service update --image $DOCKER_REGISTRY/$CI_PROJECT_NAMESPACE/$SERVICE_NAME:latest $DOCKER_SERVICE_NAME' - +deploy_arm: + stage: deploy + tags: + - arm + - shell + before_script: + - docker info + - docker logs $SERVICE_NAME || docker stop $SERVICE_NAME && docker rm $SERVICE_NAME + script: + - docker build -t $SERVICE_NAME:arm-latest . + - docker run --restart always -p 8081:8080 --name $SERVICE_NAME $SERVICE_NAME:arm-latest