new docker setup

.dockerignore

+test*.js
+*.swp
+.idea
+.DS_STORE
+node_modules
+npm-debug.log
+*~
+test/binary/tmp/*
+test/tmp/*
+test/dialects/sqlite/test.sqlite
+test/sqlite/test.sqlite
+coverage-*
+site
\ No newline at end of file

.gitignore

@@ -10,4 +10,4 @@ test/tmp/*
 test/dialects/sqlite/test.sqlite
 test/sqlite/test.sqlite
 coverage-*
-site
+site
\ No newline at end of file

CONTRIBUTING.md

@@ -67,34 +67,24 @@ $ psql
 get SQLite tests for free :)
 
 #### 3a. Docker
-If you don't feel like setting up databases and users, you can use our [docker](http://docker.io) [image](https://index.docker.io/u/mhansen/sequelize-contribution/) for sequelize contribution.
 
-Getting the image:
-```console
-$ sudo docker pull mhansen/sequelize-contribution
-```
+Makes sure Docker and docker-compose are installed.
 
-Start the container and save references to container id and ip:
-```console
-# Start mysql/postgres container
-$ CONTAINER=$(sudo docker run -d -i -t mhansen/sequelize-contribution)
-# Or start postgres 9.4 container
-$ CONTAINER=$(sudo docker run --name sequelize-postgres -e POSTGRES_USER=sequelize_test -e POSTGRES_PASSWORD=sequelize_test -d postgres:9.4)
+Then simply run:
 
-$ CONTAINER_IP=$(sudo docker inspect --format='{{.NetworkSettings.IPAddress}}' $CONTAINER)
+```sh
+npm run test-docker
 ```
 
-Run tests:
-```console
-$ SEQ_HOST=$CONTAINER_IP SEQ_USER=sequelize_test make all
-```
+And once in a while you might want to run:
 
-Stop the container:
-```console
-$ sudo docker stop $CONTAINER
+```sh
+npm run build-docker
 ```
 
-When running tests repeatedly, you only need to redo step 3 if you haven't stopped the container.
+To rebuild the image (in case of changed dependencies or similar).
+
+If sequelize is unable to connect to mysql you might want to try running `sudo docker-compose up` in a second terminal window.
 
 #### 3b. Docker and OSX:
 

Dockerfile

+FROM iojs:1.6
+
+RUN apt-get install libpq-dev
+
+COPY package.json /
+RUN npm install
+
+WORKDIR /sequelize
+VOLUME /sequelize
\ No newline at end of file

Makefile

 REPORTER ?= spec
 TESTS = $(shell find ./test/integration/* -name "*.test.js")
 DIALECT ?= mysql
+JSHINT ?= ./node_modules/.bin/jshint
+MOCHA ?= ./node_modules/.bin/mocha
 
 # test commands
 
@@ -20,7 +22,7 @@ endif
 
 # Unit tests
 test-unit:
-	./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --ui tdd --check-leaks --colors -t 15000 --reporter $(REPORTER) ./test/unit/*.js ./test/unit/**/*.js
+	$(MOCHA) --globals setImmediate,clearImmediate --ui tdd --check-leaks --colors -t 15000 --reporter $(REPORTER) ./test/unit/*.js ./test/unit/**/*.js
 
 test-unit-all: test-unit-sqlite test-unit-mysql test-unit-postgres test-unit-postgres-native test-unit-mariadb test-unit-mssql
 
@@ -40,9 +42,9 @@ test-unit-postgres-native:
 # Integration tests
 test-integration:
 	@if [ "$$GREP" ]; then \
-		./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --ui tdd --check-leaks --colors -t 15000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
+		$(MOCHA) --globals setImmediate,clearImmediate --ui tdd --check-leaks --colors -t 15000 --reporter $(REPORTER) -g "$$GREP" $(TESTS); \
 	else \
-		./node_modules/mocha/bin/mocha --globals setImmediate,clearImmediate --ui tdd --check-leaks --colors -t 15000 --reporter $(REPORTER) $(TESTS); \
+		$(MOCHA) --globals setImmediate,clearImmediate --ui tdd --check-leaks --colors -t 15000 --reporter $(REPORTER) $(TESTS); \
 	fi
 
 test-integration-all: test-integration-sqlite test-integration-mysql test-integration-postgres test-integration-postgres-native test-integration-mariadb test-integration-mssql
@@ -62,7 +64,7 @@ test-integration-postgres-native:
 
 
 jshint:
-	./node_modules/.bin/jshint lib test
+	$(JSHINT) lib test
 
 mariadb:
 	@DIALECT=mariadb make test

docker-compose.yml

+sequelize:
+  build: .
+  links:
+   - mysql
+   - postgres
+  volumes:
+    - .:/sequelize
+  environment:
+    SEQ_DB: sequelize_test
+    SEQ_USER: sequelize_test
+    SEQ_PW: sequelize_test
+    JSHINT: /node_modules/.bin/jshint
+    MOCHA: /node_modules/.bin/mocha
+
+postgres:
+  image: postgres:9.4
+  environment:
+    POSTGRES_USER: sequelize_test
+    POSTGRES_PASSWORD: sequelize_test
+
+mysql:
+  image: mysql:5.6
+  environment:
+    MYSQL_ROOT_PASSWORD: lollerskates
+    MYSQL_DATABASE: sequelize_test
+    MYSQL_USER: sequelize_test
+    MYSQL_PASSWORD: sequelize_test
\ No newline at end of file

package.json

 {
   "name": "sequelize",
-  "description": "Multi dialect ORM for Node.JS",
+  "description": "Multi dialect ORM for Node.JS/io.js",
   "version": "2.1.3",
   "author": "Sascha Depold <sascha@depold.com>",
   "contributors": [
@@ -79,6 +79,8 @@
   "main": "index",
   "scripts": {
     "test": "make all",
+    "test-docker": "sudo docker-compose run sequelize /bin/sh -c \"make all\"",
+    "build-docker": "sudo docker-compose build",
     "docs": "node docs/docs-generator.js"
   },
   "engines": {

test/config/config.js

@@ -31,8 +31,8 @@ module.exports = {
     database: process.env.SEQ_MYSQL_DB   || process.env.SEQ_DB   || 'sequelize_test',
     username: process.env.SEQ_MYSQL_USER || process.env.SEQ_USER || 'root',
     password: process.env.SEQ_MYSQL_PW   || process.env.SEQ_PW   || null,
-    host:     process.env.SEQ_MYSQL_HOST || process.env.SEQ_HOST || '127.0.0.1',
-    port:     process.env.SEQ_MYSQL_PORT || process.env.SEQ_PORT || 3306,
+    host:     process.env.MYSQL_PORT_3306_TCP_ADDR || process.env.SEQ_MYSQL_HOST || process.env.SEQ_HOST || '127.0.0.1',
+    port:     process.env.MYSQL_PORT_3306_TCP_PORT || process.env.SEQ_MYSQL_PORT || process.env.SEQ_PORT || 3306,
     pool:     {
       maxConnections: process.env.SEQ_MYSQL_POOL_MAX  || process.env.SEQ_POOL_MAX  || 5,
       maxIdleTime:    process.env.SEQ_MYSQL_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000
@@ -46,8 +46,8 @@ module.exports = {
     database: process.env.SEQ_PG_DB   || process.env.SEQ_DB    || 'sequelize_test',
     username: process.env.SEQ_PG_USER || process.env.SEQ_USER  || 'postgres',
     password: process.env.SEQ_PG_PW   || process.env.SEQ_PW    || 'postgres',
-    host:     process.env.SEQ_PG_HOST || process.env.SEQ_HOST  || '127.0.0.1',
-    port:     process.env.SEQ_PG_PORT || process.env.SEQ_PORT  || 5432,
+    host:     process.env.POSTGRES_PORT_5432_TCP_ADDR || process.env.SEQ_PG_HOST || process.env.SEQ_HOST  || '127.0.0.1',
+    port:     process.env.POSTGRES_PORT_5432_TCP_PORT || process.env.SEQ_PG_PORT || process.env.SEQ_PORT  || 5432,
     pool:     {
       maxConnections: process.env.SEQ_PG_POOL_MAX  || process.env.SEQ_POOL_MAX  || 5,
       maxIdleTime:    process.env.SEQ_PG_POOL_IDLE || process.env.SEQ_POOL_IDLE || 3000