Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2a9812f authored by Jackeagle's avatar Jackeagle
Browse files

ci: fix docker login

parent 53a5a798

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ variables: 
  services:

    - docker:20.10.16-dind

  script:

    - "docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG || true"

    - "docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY"

    - "docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY"

    - "docker pull $CI_REGISTRY_IMAGE:$IMAGE_TAG"

    - "docker build --cache-from $CI_REGISTRY_IMAGE:$IMAGE_TAG -t $CI_REGISTRY_IMAGE:$IMAGE_TAG -f $DOCKERFILE ."

    - "docker push $CI_REGISTRY_IMAGE:$IMAGE_TAG"

    - 'if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker tag $CI_REGISTRY_IMAGE:$IMAGE_TAG $CI_REGISTRY_IMAGE:$IMAGE_TAG_RELEASE && docker push $CI_REGISTRY_IMAGE:$IMAGE_TAG_RELEASE ; fi'