diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea09dc39c6fc1a70d364159e74a6a97383427f62..94c20e4d8c7bc13745f674bf53a5ec17e4812ba1 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 5e5c0597cad17bfa58137a8b3e881bea70d31cfe..d2faa3224c2147a888569f8cae7988a9b93ec54c 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