diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a592d3f..1b22ce3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,9 @@ stages: - deploy variables: - DOCKER_IMAGE: "daily-briefing-app" + REGISTRY_HOST: "10.10.10.10:5050" + IMAGE_NAME: "$REGISTRY_HOST/$CI_PROJECT_PATH" + DOCKER_IMAGE: "$IMAGE_NAME:$CI_COMMIT_REF_SLUG" CONTAINER_NAME: "daily-briefing-running" build-image: @@ -11,15 +13,19 @@ build-image: tags: - shell script: + - echo "$CI_REGISTRY_PASSWORD" | docker login "$REGISTRY_HOST" -u "$CI_REGISTRY_USER" --password-stdin - docker build -t $DOCKER_IMAGE . + - docker push $DOCKER_IMAGE deploy-container: stage: deploy tags: - vm-deploy script: + - echo "$CI_REGISTRY_PASSWORD" | docker login "$REGISTRY_HOST" -u "$CI_REGISTRY_USER" --password-stdin + - docker pull $DOCKER_IMAGE - docker stop $CONTAINER_NAME || true - docker rm $CONTAINER_NAME || true - - docker run -d --name $CONTAINER_NAME -p 8080:8080 $DOCKER_IMAGE + - docker run -d --name $CONTAINER_NAME -p 8080:8080 --restart always $DOCKER_IMAGE only: - master