From a227e593e0648f899d04d320889981b8f41e3642 Mon Sep 17 00:00:00 2001 From: Henri Burau Date: Tue, 24 Mar 2020 22:07:42 +0100 Subject: [PATCH] Ci change --- .gitlab-ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d9a676..4ce1da4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,7 @@ deploy_docker: variables: DOCKER_HOST: "ssh://pi@henriburau.de" stage: deploy - image: docker:19.03.3 - services: - - docker:19.03.3-dind + image: ubuntu tags: - docker before_script: @@ -23,9 +21,9 @@ deploy_docker: - mkdir -p ~/.ssh - chmod 700 ~/.ssh script: - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $DOCKER_REGISTRY - - lan-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 - - docker service update --image $DOCKER_REGISTRY/$CI_PROJECT_NAMESPACE/$SERVICE_NAME:latest $DOCKER_SERVICE_NAME + - 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' create_image: stage: dockerize