mirror of
https://github.com/octoleo/plantuml-server.git
synced 2025-01-03 13:07:23 +00:00
Merge pull request #118 from jarv/jarv/fix-tagging
Creates a docker tagged image for jetty and tomcat
This commit is contained in:
commit
513453e51b
27
.travis.yml
27
.travis.yml
@ -10,6 +10,8 @@ services:
|
|||||||
|
|
||||||
stages:
|
stages:
|
||||||
- build
|
- build
|
||||||
|
- name: docker-tag
|
||||||
|
if: tag IS present
|
||||||
- name: docker-push
|
- name: docker-push
|
||||||
if: branch = master
|
if: branch = master
|
||||||
|
|
||||||
@ -26,16 +28,33 @@ jobs:
|
|||||||
skip_cleanup: true
|
skip_cleanup: true
|
||||||
on:
|
on:
|
||||||
tags: true
|
tags: true
|
||||||
|
|
||||||
|
- stage: docker-tag
|
||||||
|
name: jetty
|
||||||
|
script:
|
||||||
|
- if [ -z "$TRAVIS_TAG" ]; then exit 0; fi
|
||||||
|
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
|
||||||
|
- docker build --pull -t plantuml/plantuml-server:jetty-$TRAVIS_TAG -f Dockerfile.jetty .
|
||||||
|
- docker push plantuml/plantuml-server:jetty-$TRAVIS_TAG
|
||||||
|
on:
|
||||||
|
tags: true
|
||||||
|
|
||||||
|
- stage: docker-tag
|
||||||
|
name: tomcat
|
||||||
|
script:
|
||||||
|
- if [ -z "$TRAVIS_TAG" ]; then exit 0; fi
|
||||||
|
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
|
||||||
|
- docker build --pull -t plantuml/plantuml-server:tomcat-$TRAVIS_TAG -f Dockerfile.tomcat .
|
||||||
|
- docker push plantuml/plantuml-server:tomcat-$TRAVIS_TAG
|
||||||
|
on:
|
||||||
|
tags: true
|
||||||
|
|
||||||
- stage: docker-push
|
- stage: docker-push
|
||||||
name: jetty
|
name: jetty
|
||||||
script:
|
script:
|
||||||
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
|
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
|
||||||
- docker build --pull -t plantuml/plantuml-server:jetty -f Dockerfile.jetty .
|
- docker build --pull -t plantuml/plantuml-server:jetty -f Dockerfile.jetty .
|
||||||
- docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest
|
- docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:latest
|
||||||
- if [ -n "$TRAVIS_TAG" ]; then
|
|
||||||
docker tag plantuml/plantuml-server:jetty plantuml/plantuml-server:$TRAVIS_TAG;
|
|
||||||
docker push plantuml/plantuml-server:$TRAVIS_TAG;
|
|
||||||
fi
|
|
||||||
- docker push plantuml/plantuml-server:jetty
|
- docker push plantuml/plantuml-server:jetty
|
||||||
- docker push plantuml/plantuml-server:latest
|
- docker push plantuml/plantuml-server:latest
|
||||||
- stage: docker-push
|
- stage: docker-push
|
||||||
|
Loading…
Reference in New Issue
Block a user