Commit e4dc0446 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix tags for builds (git and docker)

parent 3a0e7fc3
Loading
Loading
Loading
Loading
Loading
+28 −22
Original line number Diff line number Diff line
@@ -55,8 +55,6 @@ lint:publish:
    BUILD_TAG_COMMIT: ${CI_REGISTRY_IMAGE}/commit:${CI_COMMIT_SHORT_SHA}
    BUILD_TAG_REF: ${CI_REGISTRY_IMAGE}/ref/${CI_COMMIT_REF_SLUG}:${CI_PIPELINE_IID}
    BUILD_TAG_LATEST: ${CI_REGISTRY_IMAGE}/ref/${CI_COMMIT_REF_SLUG}:latest
    RELEASE_TAG: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_TAG#v}
    RELEASE_TAG_LATEST: ${CI_REGISTRY_IMAGE}:latest
    DOCKER_HOST: "tcp://docker:2375/"
    DOCKER_DRIVER: overlay2
    DOCKER_TLS_CERTDIR: ""
@@ -67,22 +65,34 @@ lint:publish:
    - docker info
    - docker login -u gitlab-ci-token -p "$CI_JOB_TOKEN" "$CI_REGISTRY"

build:
.branch:
  except: [ tags, master ]

.tag:
  only: [ tags ]
  except:
    - /^[^v]/
    - /^v[^0-9]/

build:branch:
  stage: build
  extends: .docker
  except: [ master ]
  extends: [ .docker, .branch ]
  script:
  - docker build . --pull=true --tag=${BUILD_TAG}
  - docker tag ${BUILD_TAG} ${BUILD_TAG_COMMIT}
  - docker push ${BUILD_TAG}
  - docker push ${BUILD_TAG_COMMIT}
    - test -z "${CI_COMMIT_TAG}" && docker tag ${BUILD_TAG} ${BUILD_TAG_REF}
    - test -z "${CI_COMMIT_TAG}" && docker push ${BUILD_TAG_REF}
  after_script:
  - docker tag ${BUILD_TAG} ${BUILD_TAG_REF}
  - docker push ${BUILD_TAG_REF}

build:tag:
  extends: [ "build:branch", .tag ]
  after_script: []

deploy:branch:
  stage: deploy
  extends: .docker
  except: [ tags, master ]
  extends: [ .docker, .branch ]
  script:
    - docker pull ${BUILD_TAG}
    - docker tag ${BUILD_TAG} ${BUILD_TAG_LATEST}
@@ -90,14 +100,10 @@ deploy:branch:

deploy:tag:
  stage: deploy
  extends: .docker
  only: [ tags ]
  except:
    - /^[^v]/
    - /^v[^0-9]/
  extends: [ .docker, .tag ]
  script:
    - docker pull ${BUILD_TAG}
    - docker tag ${BUILD_TAG} ${RELEASE_TAG}
    - docker tag ${BUILD_TAG} ${RELEASE_TAG_LATEST}
    - docker push ${RELEASE_TAG}
    - docker push ${RELEASE_TAG_LATEST}
    - 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}
    - docker push ${CI_REGISTRY_IMAGE}:latest