Commit f4238641 authored by The Heavy's avatar The Heavy 🚂
Browse files

Fix missing tag, and add branch-based tag support (for future use in new base versions)

parent 95d33dc4

.gitlab-ci.yml

+10 −5
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ before_script: 
variables:

    DOCKER_HOST: tcp://docker:2375

    DOCKER_TLS_CERTDIR: ""

    IMAGE_TAG_UNIQUE: $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH-$CI_COMMIT_REF_SLUG

    IMAGE_TAG_BRANCH: $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH

    IMAGE_TAG_LATEST: $CI_REGISTRY_IMAGE:latest



build:

    stage: build
@@ -18,14 +21,16 @@ build: 
    services:

        - docker:dind

    script:

        - docker build --pull -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG -f Dockerfile $CI_PROJECT_DIR

        - docker push $CI_REGISTRY_IMAGE

        - docker build --pull -t $IMAGE_TAG_UNIQUE -f Dockerfile $CI_PROJECT_DIR

        - docker push $IMAGE_TAG_UNIQUE

        - docker tag $IMAGE_TAG_UNIQUE $IMAGE_TAG_BRANCH

        - docker push $IMAGE_TAG_BRANCH



release:

    stage: release

    script:

        - docker pull $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG

        - docker tag $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG $CI_REGISTRY_IMAGE:latest

        - docker push $CI_REGISTRY_IMAGE:latest

        - docker pull $IMAGE_TAG_UNIQUE

        - docker tag $IMAGE_TAG_UNIQUE $IMAGE_TAG_LATEST

        - docker push $IMAGE_TAG_LATEST

    only:

        - master