Skip to content
Snippets Groups Projects
Commit 34619f49 authored by Evili del Rio i Silvan's avatar Evili del Rio i Silvan
Browse files

Merge branch 'master' into ubuntu

parents 9a4b7fdf 2d019dd5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
.gitlab-ci.yml
+ 4
− 0
View file @ 34619f49
...@@ -19,6 +19,8 @@ build: ...@@ -19,6 +19,8 @@ build:
- docker build --cache-from ${DOCKER_IMAGE}:latest --tag ${DOCKER_IMAGE}:latest -t ${DOCKER_IMAGE}:${CI_COMMIT_SHA} . - 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}:${CI_COMMIT_SHA}
- docker push ${DOCKER_IMAGE}:latest - docker push ${DOCKER_IMAGE}:latest
only:
- master
deploy: deploy:
stage: deploy stage: deploy
...@@ -29,3 +31,5 @@ deploy: ...@@ -29,3 +31,5 @@ deploy:
- docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} - docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
- docker push ${DOCKER_USER}/${DOCKER_IMAGE} - docker push ${DOCKER_USER}/${DOCKER_IMAGE}
- docker logout - docker logout
only:
- master
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment