Commit 055430e1 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Redo docker tagging in GitLab CI

parent 0552b4ca

.gitlab-ci.yml

+15 −10
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ variables: 
.docker:

  image: docker:stable

  variables:

    BUILD_TAG: ${CI_REGISTRY_IMAGE}/build/${CI_COMMIT_REF_SLUG}:${CI_PIPELINE_IID}

    BUILD_TAG: ${CI_REGISTRY_IMAGE}/build:${CI_PIPELINE_IID}

    DOCKER_HOST: "tcp://docker:2375/"

    DOCKER_DRIVER: overlay2

    DOCKER_TLS_CERTDIR: ""
@@ -40,26 +40,31 @@ build: 
      --tag=${BUILD_TAG}

    - docker push ${BUILD_TAG}



deploy:branch:

deploy:commit:

  stage: deploy

  extends: .docker

  except: [ tags, master ]

  variables:

    LATEST_TAG: ${CI_REGISTRY_IMAGE}/build/${CI_COMMIT_REF_SLUG}:latest

  script:

    TAG: ${CI_REGISTRY_IMAGE}/commit:${CI_COMMIT_SHORT_SHA}

  before_script:

    - docker pull ${BUILD_TAG}

    - docker tag ${BUILD_TAG} ${LATEST_TAG}

    - docker push ${LATEST_TAG}

  script:

    - docker tag ${BUILD_TAG} ${TAG}

    - docker push ${TAG}



deploy:branch:

  extends: [ "deploy:commit" ]

  only: [ branches ]

  except: [ master ]

  variables:

    TAG: ${CI_REGISTRY_IMAGE}/branch/${CI_COMMIT_REF_SLUG}:latest



deploy:tag:

  stage: deploy

  extends: .docker

  extends: [ "deploy:commit" ]

  only: [ tags ]

  except:

    - /^[^v]/

    - /^v[^0-9]/

  script:

    - docker pull ${BUILD_TAG}

    - docker tag ${BUILD_TAG} ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG#v}

    - docker tag ${BUILD_TAG} ${CI_REGISTRY_IMAGE}:latest

    - docker push ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG#v}