Skip to content

Commit 81c6c97

Browse files
committed
DEV-267 | update travis-ci build with Docker
1 parent c86b662 commit 81c6c97

File tree

3 files changed

+21
-14
lines changed

3 files changed

+21
-14
lines changed

.travis.yml

+21-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
sudo: required # use container-based infrastructure instead of legacy
2-
language: ruby
2+
language: python
3+
services:
4+
- docker
5+
env:
6+
global:
7+
- DOCKER_FILE=Dockerfile-dev
8+
- IMAGE_TAG_PREFIX=dev_
9+
- CI_BUILD_TIME=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
10+
- CI_REGISTRY_IMAGE=$DOCKER_IMAGE
11+
- GH_REPO="teracyhq/dev"
12+
- secure: Jt7QOiv7Q6/QTw3q9leGMfgGfGYO9+0KF9vCwgCdDsjqlj8Qtdt31E57OxYHquApyCReR7WHATL1eML4dRcrqX4QOGxzktfX6RD7Mqx2wwutyoP/vfb4SXuLVjofnGTsddHEZW4dfFnFh48QEWsuA4svRvAO4ILt/uTupTvSUBo=
313
before_install:
414
- git submodule update --init --recursive
515
before_script:
@@ -8,22 +18,22 @@ before_script:
818
- export REPO_URL="https://[email protected]/$GH_REPO.git"
919
- . ./.travis/setup.sh
1020
- echo $DEPLOY_HTML_DIR
21+
- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH | sed -e 's/[\/]/-/g'; fi`
22+
- export CONTAINER_IMAGE=$CI_REGISTRY_IMAGE:$IMAGE_TAG_PREFIX$TAG
1123
script:
12-
- bundle exec rake build
13-
after_script:
24+
- docker build -f $DOCKER_FILE --build-arg CI_BUILD_ID=$TRAVIS_BUILD_ID --build-arg
25+
CI_BUILD_REF=$TRAVIS_COMMIT --build-arg CI_BUILD_REF_NAME=$TRAVIS_BRANCH --build-arg
26+
CI_BUILD_TIME=$CI_BUILD_TIME --build-arg CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE --build-arg
27+
CI_PROJECT_NAME=$TRAVIS_REPO_SLUG --pull -t $CONTAINER_IMAGE .
28+
- docker run -v $(pwd):/opt/app $CONTAINER_IMAGE rake build
29+
after_success:
1430
- sudo pip install -r docs/requirements.txt
1531
- cd docs
1632
- make setup_gh_pages
1733
- make generate
1834
- make deploy
19-
rvm:
20-
- 1.9.3
21-
gemfile:
22-
- Gemfile
23-
env:
24-
global:
25-
- GH_REPO="teracyhq/dev"
26-
- secure: Jt7QOiv7Q6/QTw3q9leGMfgGfGYO9+0KF9vCwgCdDsjqlj8Qtdt31E57OxYHquApyCReR7WHATL1eML4dRcrqX4QOGxzktfX6RD7Mqx2wwutyoP/vfb4SXuLVjofnGTsddHEZW4dfFnFh48QEWsuA4svRvAO4ILt/uTupTvSUBo=
35+
- docker login -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD
36+
- docker push $CONTAINER_IMAGE
2737
notifications:
2838
slack:
2939
on_success: :change

docker-compose-mac.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ services:
44
dev:
55
volumes:
66
- teracy-dev-sync:/opt/app:rw
7-
87
volumes:
98
teracy-dev-sync:
109
external: true

docker-compose.yml

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@ services:
77
dockerfile: Dockerfile-dev
88
image: teracy/dev:dev_develop
99
command: bash -c "rake build && rake berks_install"
10-
ports:
11-
- "4000:4000"
1210
volumes:
1311
- .:/opt/app

0 commit comments

Comments
 (0)