Skip to content

Commit 4cf9eed

Browse files
committed
Improve Travis deployment process
1 parent 0f4eaed commit 4cf9eed

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ sudo: required
33
env:
44
global:
55
- TAG_PATTERN="^[0-9]+(\.[0-9]+){2}(-(alpha|beta|rc))?$"
6-
- DOCKER_IMAGE=eexit/mirror-http-server:${TRAVIS_TAG:=$TRAVIS_BUILD_NUMBER}
6+
- DOCKER_IMAGE=eexit/mirror-http-server
7+
- DOCKER_TAG=${TRAVIS_TAG:=$TRAVIS_BUILD_NUMBER}
78

89
services:
910
- docker
@@ -12,10 +13,10 @@ before_install:
1213
- docker login --email=$DOCKER_EMAIL --username=$DOCKER_USER --password=$DOCKER_PASSWD
1314

1415
install:
15-
- docker build -t $DOCKER_IMAGE .
16+
- docker build -t $DOCKER_IMAGE:$DOCKER_TAG .
1617

1718
script:
18-
- docker run $DOCKER_IMAGE npm test
19+
- docker run $DOCKER_IMAGE:$DOCKER_TAG npm test
1920

2021
after_success:
21-
- if [[ "$TRAVIS_TAG" =~ $TAG_PATTERN ]]; then docker push $DOCKER_IMAGE; fi
22+
- $(pwd)/docker-push

docker-push

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/bash
2+
set -e
3+
4+
if [[ "$TRAVIS_TAG" =~ $TAG_PATTERN ]]; then
5+
echo "Pushing $DOCKER_IMAGE:$DOCKER_TAG"
6+
docker push $DOCKER_IMAGE:$DOCKER_TAG;
7+
8+
echo "Tagging $DOCKER_IMAGE:$DOCKER_TAG as $DOCKER_IMAGE:latest"
9+
docker tag $DOCKER_IMAGE:$DOCKER_TAG $DOCKER_IMAGE:latest
10+
11+
echo "Pushing $DOCKER_IMAGE:latest"
12+
docker push $DOCKER_IMAGE:latest
13+
fi

0 commit comments

Comments
 (0)