From 2c6075bc5d85c756a9130fbf4b8b6e4aa1d05b35 Mon Sep 17 00:00:00 2001
From: Lucas Fernandes de Oliveira <lfo14@inf.ufpr.br>
Date: Wed, 20 Dec 2017 11:14:24 -0200
Subject: [PATCH] Issue #53: Fix error on deploy stage of pipeline
Signed-off-by: Lucas Fernandes de Oliveira <lfo14@inf.ufpr.br>
---
.gitlab-ci.yml | 10 ++++++----
docker-compose.yml | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea09dc39..94c20e4d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ variables:
POSTGRES_USER: 'runner'
POSTGRES_PASSWORD: ''
PKG_VERSION: 'latest'
+ DOCKER_URL: 'marula.c3sl.ufpr.br:5000/c3sl/blendb:'
cache:
paths:
@@ -34,11 +35,11 @@ run_tests:
build:
stage: build
variables:
- PKG_VERSION: 'latest'
+ PKG_VERSION: ''
script:
- PKG_VERSION=$(cat package.json | grep \"version\" | cut -f2 -d':'| sed -e 's/"\|,//g' | tr -d ' ')
- echo ${PKG_VERSION}
- - docker build -t marula.c3sl.ufpr.br:5000/c3sl/blendb:${PKG_VERSION} .
+ - docker build -t ${DOCKER_URL}${PKG_VERSION} -t ${DOCKER_URL}latest .
tags:
- docker
- build
@@ -46,10 +47,11 @@ build:
deploy:
stage: deploy
variables:
- PKG_VERSION: 'latest'
+ PKG_VERSION: ''
script:
- PKG_VERSION=$(cat package.json | grep \"version\" | cut -f2 -d':'| sed -e 's/"\|,//g' | tr -d ' ')
- - docker push marula.c3sl.ufpr.br:5000/c3sl/blendb:${PKG_VERSION} .
+ - docker push ${DOCKER_URL}${PKG_VERSION}
+ - docker push ${DOCKER_URL}latest
tags:
- docker
- build
diff --git a/docker-compose.yml b/docker-compose.yml
index 5e5c0597..d2faa322 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
services:
blendb:
image: marula.c3sl.ufpr.br:5000/c3sl/blendb:latest
- build: /home/lfo14/c3sl/blendb
+ build: .
container_name: blendb
# depends_on:
# - db
--
GitLab