Skip to content

Commit 953145b

Browse files
committed
Merge pull request #173 from arschles/run-docker-build
fix(.travis.yml): run the docker-build target on all branches
2 parents a3ebb95 + c00cfe8 commit 953145b

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ branches:
55
cache:
66
directories:
77
- vendor
8+
env:
9+
DEV_REGISTRY=quay.io
810
services:
911
- docker
1012
sudo: required
1113
install:
1214
- make bootstrap
1315
script:
14-
- make test
16+
- make test build docker-build
1517
deploy:
1618
provider: script
1719
script: _scripts/deploy.sh

rootfs/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
FROM alpine:3.3
22

3+
# install git and configure gituser
4+
ENV GITHOME /home/git
5+
ENV GITUSER git
6+
37
# install common packages
48
RUN apk add --update-cache \
59
bash \
@@ -24,9 +28,6 @@ RUN mkdir -p /var/run/sshd && rm -rf /etc/ssh/ssh_host* \
2428

2529
COPY . /
2630

27-
# install git and configure gituser
28-
ENV GITHOME /home/git
29-
ENV GITUSER git
3031
# this is so the minio client (https://github.com/minio/mc) works properly
3132
ENV DOCKERIMAGE=1
3233
ENV DEIS_RELEASE 2.0.0-dev

0 commit comments

Comments
 (0)