Skip to content

Commit 138af29

Browse files
committed
Fixed travis build
1 parent e2dc742 commit 138af29

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.travis.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
sudo: required
2-
language: go
3-
go: 1.6
2+
language: generic
3+
44
services:
55
- docker
66

@@ -15,8 +15,12 @@ script:
1515
- if git describe --contains ${TRAVIS_COMMIT} &>/dev/null; then export VERSIONARGS="-var DOCKERIMAGE_VERSION=`git describe --contains ${TRAVIS_COMMIT}`"; else unset VERSIONARGS; fi
1616
- rocker build --no-cache ${VERSIONARGS} -var GIT_COMMIT=${TRAVIS_COMMIT} -var OUTPUT_DIR=/build/amd64 -var ARCH=amd64 .
1717
- rocker build --no-cache ${VERSIONARGS} -var GIT_COMMIT=${TRAVIS_COMMIT} -var OUTPUT_DIR=/build/arm -var ARCH=arm .
18+
19+
after_success:
1820
- sudo mv /build/amd64/dnsdock /build/dnsdock.amd64
1921
- sudo mv /build/arm/dnsdock /build/dnsdock.arm
22+
- sudo chmod -R a+rw /build
23+
- sudo chmod a+rx ./deploy_containers.sh
2024

2125
deploy:
2226
- provider: releases
@@ -34,10 +38,10 @@ deploy:
3438
on:
3539
tags: true
3640
- provider: script
37-
script: rocker build --auth $DOCKER_USER:$DOCKER_PASSWORD --push rocker build -var Arch=arm -var ${VERSIONARGS} .
41+
script: rocker build --auth $DOCKER_USER:$DOCKER_PASSWORD --push -var GIT_COMMIT=${TRAVIS_COMMIT} ${VERSIONARGS} -var ARCH=amd64 .
3842
on:
3943
tags: true
4044
- provider: script
41-
script: rocker build --auth $DOCKER_USER:$DOCKER_PASSWORD --push rocker build -var Arch=amd64 -var ${VERSIONARGS} .
45+
script: rocker build --auth $DOCKER_USER:$DOCKER_PASSWORD --push -var GIT_COMMIT=${TRAVIS_COMMIT} ${VERSIONARGS} -var ARCH=arm .
4246
on:
43-
tags: true
47+
tags: true

deploy_containers.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/usr/bin/env bash
2+
rocker build --auth $DOCKER_USER:$DOCKER_PASSWORD --push -var GIT_COMMIT=${TRAVIS_COMMIT} -var ARCH=amd64 -var ${VERSIONARGS} .
3+
rocker build --auth $DOCKER_USER:$DOCKER_PASSWORD --push -var GIT_COMMIT=${TRAVIS_COMMIT} -var ARCH=arm ${VERSIONARGS} .
4+

0 commit comments

Comments
 (0)