Commit 4fa64309 authored by Dylan Griffith's avatar Dylan Griffith
Browse files

Merge branch 'docker-tag-on-git-tag' into 'master' 

Removes gitlab based scheme, use git tag scheme

Closes #9

See merge request gitlab-org/cluster-integration/auto-deploy-image!14
parents eb173b8f f5c868ac

.gitlab-ci.yml

+5 −7
Original line number Diff line number Diff line
@@ -210,8 +210,6 @@ test-create-application-secret: 
  image: docker:stable

  services:

    - docker:stable-dind

  variables:

    RELEASE_IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_JOB_NAME"

  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"

  script:
@@ -219,13 +217,13 @@ test-create-application-secret: 
    - docker tag "$BUILD_IMAGE_NAME" "$RELEASE_IMAGE_NAME"

    - docker push "$RELEASE_IMAGE_NAME"

  only:

    - master



12-1-stable:

  extends: .release

    - tags



12-2-stable:

release-tag:

  extends: .release

  variables:

    # e.g. auto-deploy-image:v1.0.0

    RELEASE_IMAGE_NAME: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"



before_script:

  - |