Skip to content

Commit bafac5e

Browse files
committed
Use bash instead of sh:)
1 parent dbd89b6 commit bafac5e

3 files changed

Lines changed: 17 additions & 4 deletions

File tree

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,9 @@ before_install:
99
- pip install --user awscli
1010
- export PATH=$PATH:$HOME/.local/bin
1111

12+
before_script:
13+
- docker --version
14+
- aws --version
15+
1216
script:
1317
./Scripts/BuildImage_Release.sh

Scripts/BuildImage_Debug.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#!/bin/sh
1+
#!/bin/bash
2+
23
set -e
34

45
if [ "${TRAVIS_TAG}" != "" ]; then

Scripts/BuildImage_Release.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#!/bin/sh
1+
#!/bin/bash
2+
23
set -e
34

45
if [ "${TRAVIS_TAG}" != "" ]; then
@@ -9,6 +10,9 @@ if [ "${TRAVIS_TAG}" != "" ]; then
910
export SUBTAG=develop
1011
fi
1112

13+
export REPO=${DOCKER_AWS_REPONAME}
14+
export TAG=${TRAVIS_TAG}-${DBVersion}-$SUBTAG
15+
1216
docker run -it -d --name builder microsoft/dotnet:1.1.2-sdk tail -f /dev/null
1317
docker cp src/SimpleToDoService builder:app
1418
docker exec builder bash -c 'cd /app; dotnet restore; dotnet publish --configuration release -o "../published/release"'
@@ -20,7 +24,9 @@ if [ "${TRAVIS_TAG}" != "" ]; then
2024
export REPO=${DOCKER_AWS_REPONAME}
2125
export TAG=${TRAVIS_TAG}-release
2226
docker build -f Dockerfile.release -t $REPO:$TAG .
23-
docker tag $REPO:$TAG $REPO:latest
27+
if [ "$SUBTAG" = "release" ]; then
28+
docker tag $REPO:$TAG $REPO:latest
29+
fi
2430
docker push $REPO > PushLog.log
2531
echo "AWS push log ===="
2632
cat PushLog.log
@@ -30,7 +36,9 @@ if [ "${TRAVIS_TAG}" != "" ]; then
3036
docker login -u ${DOCKER_USER} -p ${DOCKER_PASS}
3137
export REPO=reloni/todo-service
3238
docker build -f Dockerfile.release -t $REPO:$TAG .
33-
docker tag $REPO:$TAG $REPO:latest
39+
if [ "$SUBTAG" = "release" ]; then
40+
docker tag $REPO:$TAG $REPO:latest
41+
fi
3442
docker push $REPO > PushLog.log
3543
echo "Docker hub push log ===="
3644
cat PushLog.log

0 commit comments

Comments
 (0)