File tree Expand file tree Collapse file tree 1 file changed +2
-8
lines changed
Expand file tree Collapse file tree 1 file changed +2
-8
lines changed Original file line number Diff line number Diff line change @@ -35,14 +35,8 @@ script:
3535- cd frontend && yarn && yarn run build
3636- cd ../frontend-webjars && mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
3737- cd ../backend && mvn package -DskipTests=true -Dmaven.javadoc.skip=true -B -V
38- - cd ..
39- - docker login -u $DOCKER_USER -p $DOCKER_PASS
40- - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH
41- ; fi`
42- - docker build -f Dockerfile -t $REPO:$COMMIT .
43- - docker tag $REPO:$COMMIT $REPO:$TAG
44- - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER
45- - docker push $REPO
38+ - cd .. && docker build -f Dockerfile -t $REPO:$COMMIT .
39+ - if [ -n $TRAVIS_TAG ]; then docker tag $REPO:$COMMIT $REPO:$TRAVIS_TAG ; docker tag $REPO:$COMMIT $REPO:latest ; docker login -u $DOCKER_USER -p $DOCKER_PASS ; docker push $REPO ; fi
4640
4741before_cache :
4842- set -e
You can’t perform that action at this time.
0 commit comments