Fix .travis.yml

.travis.yml

@@ -1,7 +1,6 @@
 sudo: required
 language: go
 go_import_path: github.com/ethereum/go-ethereum
-services: skip
 
 jobs:
   include:
@@ -54,44 +53,47 @@ jobs:
         branch: master
         tags: true
 
-  - stage: Build and push tomochain/tomochain image
+  - stage: Build and push untagged commit into image tomochain
     services:
       - docker
-    before_install:
+    install: skip
+    before_script:
       - docker build -t tomochain/tomochain .
       - docker run tomochain/tomochain
-    install: skip
-    script: skip
-    deploy:
-      - provider: script
-        script:
-          - bash docker_push.sh latest
-          - bash docker_push.sh $TRAVIS_BUILD_ID
-        on:
-          branch: master
-          tags: false
-      - provider: script
-        script:
-          - bash docker_push.sh latest
-          - bash docker_push.sh $TRAVIS_TAG
-        on:
-          branch: master
-          tags: true
+    script:
+      - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+      - docker tag tomochain/tomochain tomochain/tomochain:latest
+      - docker push tomochain/tomochain:latest
+      - docker tag tomochain/tomochain tomochain/tomochain:$TRAVIS_BUILD_ID
+      - docker push tomochain/tomochain:$TRAVIS_BUILD_ID
+    after_success:
+      - curl -X POST $INFRA_IMAGE_REBUILD_HOOK
 
-  - stage: Trigger rebuild of tomochain/infra-tomochain image
-    sudo: false
+  - stage: Build and push tagged commit into image tomochain
+    services:
+      - docker
     install: skip
-    script: bash docker_rebuild.sh
+    before_script:
+      - docker build -t tomochain/tomochain .
+      - docker run tomochain/tomochain
+    script:
+      - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+      - docker tag tomochain/tomochain tomochain/tomochain:latest
+      - docker push tomochain/tomochain:latest
+      - docker tag tomochain/tomochain tomochain/tomochain:$TRAVIS_TAG
+      - docker push tomochain/tomochain:$TRAVIS_TAG
+    after_success:
+      - curl -X POST $INFRA_IMAGE_REBUILD_HOOK
 
 stages:
   - name: Lint
   - name: Build and test
   - name: Github release
     if: type != pull_request AND branch = master AND tag = true AND repo = tomochain/tomochain
-  - name: Build and push tomochain/tomochain image
-    if: type != pull_request AND branch = master AND repo = tomochain/tomochain
-  - name: Trigger rebuild of tomochain/infra-tomochain image
-    if: type != pull_request AND branch = master AND repo = tomochain/tomochain
+  - name: Build and push untagged commit into image tomochain
+    if: type != pull_request AND branch = master AND tag = false AND repo = tomochain/tomochain
+  - name: Build and push tagged commit into image tomochain
+    if: type != pull_request AND branch = master AND tag = true AND repo = tomochain/tomochain
 
 notifications:
   slack:

docker_push.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-docker tag tomochain/tomochain tomochain/tomochain:$1
-docker push tomochain/tomochain:$1

docker_rebuild.sh

@@ -1 +0,0 @@
-curl -X POST $INFRA_IMAGE_REBUILD_HOOK