Merge branch 'issue/53' into 'master'

Issue #53: Fix error on deploy stage of pipeline

See merge request c3sl/blendb!51

.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

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