From 7ac941567ecb2330c6870c88345e1b11966bb0f1 Mon Sep 17 00:00:00 2001
From: Evili del Rio <erio@iri.upc.edu>
Date: Tue, 13 Nov 2018 13:54:30 +0100
Subject: [PATCH] Correct tagging
---
.gitlab-ci.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45d26ed..4764ed2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,17 +9,20 @@ services:
before_script:
- docker info
+ - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
+ - printenv
build:
stage: build
script:
- - docker build -t django .
+ - docker pull ${DOCKER_IMAGE}:latest || true
+ - docker build --cache-from ${DOCKER_IMAGE}:latest --tag ${DOCKER_IMAGE}:latest -t ${DOCKER_IMAGE}:${CI_COMMIT_SHA} .
+ - docker push ${DOCKER_IMAGE}:${CI_COMMIT_SHA}
+ - docker push ${DOCKER_IMAGE}:latest
deploy:
stage: deploy
script:
- - printenv
- - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
- docker pull ${CI_REGISTRY_IMAGE}
- docker logout
- docker tag ${CI_PROJECT_NAME} ${DOCKER_USER}/${DOCKER_IMAGE}
--
GitLab