diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1f9e02..69d8aea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,8 @@ +image: docker:latest + +services: + - docker:dind + stages: - build - push @@ -6,41 +11,32 @@ before_script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY Build: - image: docker:latest script: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA . - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - services: - - docker:dind stage: build tags: - docker Push latest: - image: docker:latest only: - master script: - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:latest - docker push $CI_REGISTRY_IMAGE:latest - services: - - docker:dind stage: push tags: - docker Push tag: - image: docker:latest only: - tags script: - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - services: - - docker:dind stage: push tags: - docker