Skip to content

Commit 9cda5b1

Browse files
author
Topi Paavilainen
committed
run docker on travis
1 parent 542c542 commit 9cda5b1

File tree

2 files changed

+17
-27
lines changed

2 files changed

+17
-27
lines changed

.travis.yml

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,13 @@
1+
sudo: required
12
language: python
23
python:
34
- "2.7"
45

5-
addons:
6-
postgresql: "9.3"
6+
services:
7+
- docker
78

8-
install:
9-
- sudo apt-get update -y &&
10-
sudo apt-get install -y
11-
build-essential htop
12-
python-dev python-pip python-virtualenv
13-
libxml2-dev libxslt1-dev
14-
libcurl4-openssl-dev libssl-dev zlib1g-dev libpcre3-dev
15-
libldap2-dev libsasl2-dev
16-
libjpeg-dev
17-
libfreetype6-dev
18-
libpq-dev
19-
npm
20-
memcached
21-
- npm install
22-
- pip install -r requirements.txt
9+
before_install:
10+
- docker build -t fum .
11+
- docker build -t fum-test docker/test/
2312

24-
- mkdir -p media/portraits/full media/portraits/thumb media/portraits/badge
25-
- psql -c 'create database fum;' -U postgres
26-
- cp local_settings.py.template local_settings.py
27-
- sed -i local_settings.py
28-
-e "s/^SECRET_KEY =.*$/SECRET_KEY = 'test'/"
29-
-e "s/company/futurice/g"
30-
-e "s/Company/Futurice/g"
31-
-e 's/example\.com/futurice.com/g'
32-
33-
script: python manage.py test --settings=fum.settings.test --noinput fum
13+
script: docker run fum-test

docker/test/Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM fum-docker
2+
3+
RUN cp local_settings.py.template local_settings.py
4+
RUN sed -i local_settings.py \
5+
-e "s/^SECRET_KEY =.*$/SECRET_KEY = 'test'/" \
6+
-e "s/company/futurice/g" \
7+
-e "s/Company/Futurice/g" \
8+
-e 's/example\.com/futurice.com/g'
9+
10+
CMD python manage.py test --settings=fum.settings.test --noinput fum

0 commit comments

Comments
 (0)