Skip to content

Commit

Permalink
Can't get multiple DB set-up on docker to work.
Browse files Browse the repository at this point in the history
I'm happy with this set-up for the time being. But really sucks!
  • Loading branch information
skytreader committed Feb 21, 2017
1 parent 5e2b89a commit 2e556e3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ language: python
python:
- "2.7"
sudo: required
services:
- docker
dist: trusty
before_install:
- switch_to_oraclejdk7
- sudo docker-compose up --build
- sudo apt-get update -qq
- sudo apt-get install -y xvfb
- sudo apt-get install -y firefox
- sudo apt-get install -y mysql-client-core-5.6
- sudo apt-get install -y mysql-client-5.6
- sudo apt-get install -y mysql-server-5.6
install: "pip install -r requirements.txt"
before_script:
- pip install -r test-requirements.txt
script: "sudo docker-compose run web ./runtests --with-xcoverage && ./run_js_tests"
- fab -H localhost create_database:is_test=True
script: "./runtests --with-xcoverage && ./run_js_tests"
after_success: "COVERALLS_REPO_TOKEN=$coveralls_token coveralls"
after_failure: "COVERALS_REPO_TOKEN=$coveralls_token coveralls"
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ services:
image: "mysql:5.7"
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=alexandria
ports:
- "3308:3306"
volumes:
- "./docker-setup/init.sql:/docker-entrypoint-initdb.d/init.sql"
web:
build: .
command: python run.py
Expand Down

0 comments on commit 2e556e3

Please sign in to comment.